mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-17 16:10:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r8150] Purpose:

Browse Source 
introduced the constant H5Z_FILTER_ALL, used to remove all filters in H5Premove_filter

Description:

Solution:

Platforms tested:
linux

Misc. update:
This commit is contained in:
Pedro Vicente Nunes 2004-02-04 15:35:37 -05:00
parent 78fb916259
commit c238a6c13c
7 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/html/RM_H5P.html
View File

@ -1209,7 +1209,7 @@ SUBROUTINE
<center>
<table width=75%>
<tr valign=top align=left><td>
<code>H5Z_FILTER_NONE</code>
<code>H5Z_FILTER_ALL</code>
</td><td>
Removes all filters from the permanent filter pipeline.
</td></tr>
@ -1266,7 +1266,7 @@ SUBROUTINE h5premove_filter_f(prp_id, filter, hdferr)
INTEGER, INTENT(IN) :: filter ! Filter to be modified
! Valid values are:
!
! H5Z_FILTER_NONE_F
! H5Z_FILTER_ALL_F
! H5Z_FILTER_DEFLATE_F
! H5Z_FILTER_SHUFFLE_F
! H5Z_FILTER_FLETCHER32_F

2
fortran/src/H5f90global.f90
View File

@ -521,6 +521,7 @@
INTEGER :: H5Z_FILTER_ERROR_F
INTEGER :: H5Z_FILTER_NONE_F
INTEGER :: H5Z_FILTER_ALL_F
INTEGER :: H5Z_FILTER_DEFLATE_F
INTEGER :: H5Z_FILTER_SHUFFLE_F
INTEGER :: H5Z_FILTER_FLETCHER32_F
@ -533,6 +534,7 @@
EQUIVALENCE(H5Z_flags(1), H5Z_FILTER_ERROR_F)
EQUIVALENCE(H5Z_flags(2), H5Z_FILTER_NONE_F)
EQUIVALENCE(H5Z_flags(2), H5Z_FILTER_ALL_F)
EQUIVALENCE(H5Z_flags(3), H5Z_FILTER_DEFLATE_F)
EQUIVALENCE(H5Z_flags(4), H5Z_FILTER_SHUFFLE_F)
EQUIVALENCE(H5Z_flags(5), H5Z_FILTER_FLETCHER32_F)

2
fortran/test/tH5Z.f90
View File

@ -130,7 +130,7 @@
endif
! Delete all filters
CALL h5premove_filter_f(crtpr_id, H5Z_FILTER_NONE_F, error)
CALL h5premove_filter_f(crtpr_id, H5Z_FILTER_ALL_F, error)
CALL check("h5premove_filter_f", error, total_error)
! Verify the correct number of filters now

2
src/H5Z.c
View File

@ -1117,7 +1117,7 @@ H5Z_delete(H5O_pline_t *pline, H5Z_filter_t filter)
HGOTO_DONE(SUCCEED)
/* Delete all filters */
if (H5Z_FILTER_NONE==filter) {
if (H5Z_FILTER_ALL==filter) {
if(H5O_reset(H5O_PLINE_ID, pline)<0)
HGOTO_ERROR(H5E_PLINE, H5E_CANTFREE, FAIL, "can't release pipeline info")
} /* end if */

1
src/H5Zpublic.h
View File

@ -29,6 +29,7 @@
typedef int H5Z_filter_t;
#define H5Z_FILTER_ERROR (-1) /*no filter */
#define H5Z_FILTER_NONE 0 /*reserved indefinitely */
#define H5Z_FILTER_ALL 0 /*symbol to remove all filters in H5Premove_filter */
#define H5Z_FILTER_DEFLATE 1 /*deflation like gzip */
#define H5Z_FILTER_SHUFFLE 2 /*shuffle the data */
#define H5Z_FILTER_FLETCHER32 3 /*fletcher32 checksum of EDC */

2
test/dsets.c
View File

@ -3166,7 +3166,7 @@ test_filter_delete(hid_t file)
*----------------------------------------------------------------------
*/
/* delete all filters */
if (H5Premove_filter(dcpl1,H5Z_FILTER_NONE)<0) goto error;
if (H5Premove_filter(dcpl1,H5Z_FILTER_ALL)<0) goto error;
/* get information about filters */
if ((nfilters = H5Pget_nfilters(dcpl1))<0) goto error;

2
tools/h5repack/h5repack_filters.c
View File

@ -205,7 +205,7 @@ int apply_filters(hid_t dcpl_id,
*/
if (nfilters) {
if (H5Premove_filter(dcpl_id,H5Z_FILTER_NONE)<0)
if (H5Premove_filter(dcpl_id,H5Z_FILTER_ALL)<0)
return -1;
}