[svn-r8113] Purpose:

new library function H5Pdelete_filter
deletes one or all filters from a dataset creation property list
this was done for the NONE option of h5repack, added tests for this feature
added a test for the new function in /test/dsets.c


Description:

Solution:

Platforms tested:
linux
solaris
AIX

Misc. update:

1 files changed, 12 insertions, 5 deletions

diff --git a/tools/h5repack/h5repack_verify.c b/tools/h5repack/h5repack_verify.c
index 2283bc5..bbf0492 100644
--- a/tools/h5repack/h5repack_verify.c
+++ b/tools/h5repack/h5repack_verify.c
@@ -47,11 +47,15 @@ int has_filter(hid_t dcpl_id,
  
  /* if no information about the input filter is requested return exit */
  if (filtnin==-1)
-  return 1;
+  return 1; 
  
  /* get information about filters */
  if ((nfilters = H5Pget_nfilters(dcpl_id))<0) 
   return -1;
+
+ /* if we do not have filters and the requested filter is NONE, return 1 */
+ if (!nfilters && filtnin==H5Z_FILTER_NONE)
+  return 1;
  
  for (i=0; i<nfilters; i++) 
  {
@@ -190,11 +194,14 @@ int h5repack_verify(const char *fname,
   }
 
 /*-------------------------------------------------------------------------
- * layout check
+ * layout check; check only if a filter exists
  *-------------------------------------------------------------------------
  */
-  if (has_layout(dcpl_id,obj)==0)
-   ret=0;
+  if (obj->filter[j].filtn>H5Z_FILTER_NONE )
+  {
+   if (has_layout(dcpl_id,obj)==0)
+    ret=0;
+  }
 
 /*-------------------------------------------------------------------------
  * close
@@ -248,7 +255,7 @@ int h5repack_verify(const char *fname,
   * filter check
   *-------------------------------------------------------------------------
   */
-    if (options->all_filter==1){
+    if (options->all_filter==1 ){
      if (has_filter(dcpl_id,options->filter_g.filtn)==0)
       ret=0;
     }