[svn-r8150] Purpose:

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

Description:

Solution:

Platforms tested:
linux

Misc. update:

7 files changed, 9 insertions, 6 deletions

diff --git a/doc/html/RM_H5P.html b/doc/html/RM_H5P.html
index 15edd68..a12084e 100644
--- a/doc/html/RM_H5P.html
+++ b/doc/html/RM_H5P.html
@@ -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
diff --git a/fortran/src/H5f90global.f90 b/fortran/src/H5f90global.f90
index 47dfee6..8b6979c 100644
--- a/fortran/src/H5f90global.f90
+++ b/fortran/src/H5f90global.f90
@@ -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)
diff --git a/fortran/test/tH5Z.f90 b/fortran/test/tH5Z.f90
index 214d2ab..7005e14 100644
--- a/fortran/test/tH5Z.f90
+++ b/fortran/test/tH5Z.f90
@@ -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
diff --git a/src/H5Z.c b/src/H5Z.c
index d0b3783..f92ff33 100644
--- a/src/H5Z.c
+++ b/src/H5Z.c
@@ -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 */
diff --git a/src/H5Zpublic.h b/src/H5Zpublic.h
index ac0a718..ee7ad3c 100644
--- a/src/H5Zpublic.h
+++ b/src/H5Zpublic.h
@@ -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       */
diff --git a/test/dsets.c b/test/dsets.c
index 90e1d62..84c48fe 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -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; 
diff --git a/tools/h5repack/h5repack_filters.c b/tools/h5repack/h5repack_filters.c
index 42eecb2..81a99ce 100644
--- a/tools/h5repack/h5repack_filters.c
+++ b/tools/h5repack/h5repack_filters.c
@@ -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;
  }