[svn-r9121] Purpose:

new feature

Description:

added a check that the chunk size must be smaller than pixels per block in SZIP request
prints a message and exits, if not met



Solution:

Platforms tested:
linux
aix
solaris

Misc. update:

1 files changed, 0 insertions, 49 deletions

diff --git a/tools/h5repack/h5repack.c b/tools/h5repack/h5repack.c
index c0cc918..14779c5 100644
--- a/tools/h5repack/h5repack.c
+++ b/tools/h5repack/h5repack.c
@@ -336,55 +336,6 @@ static int check_options(pack_opt_t *options)
 
    has_cp=1;
 
-#if defined (CHECK_SZIP)
-  
-   /*check for invalid combination of options */
-   switch (pack.filter[j].filtn)
-   {
-   default:
-    break;
-   case H5Z_FILTER_SZIP:
-    {
-     
-    unsigned szip_options_mask=H5_SZIP_NN_OPTION_MASK;
-    unsigned szip_pixels_per_block;
-
-    szip_pixels_per_block=pack.filter[j].cd_values[0];
-
-    if (pack.filter[j].szip_coding==0)
-     szip_options_mask=H5_SZIP_NN_OPTION_MASK;
-    else 
-     szip_options_mask=H5_SZIP_EC_OPTION_MASK;
-    
-    /* check szip parameters */
-    if ( pack.chunk.rank!=-1 /* 
-                             it means a layout was not input, so there is no 
-                             case to try to check it
-                             */
-     && check_szip(0, /* do not test size */
-     pack.chunk.rank,
-     pack.chunk.chunk_lengths,
-     szip_options_mask,
-     &szip_pixels_per_block,
-     options)==0)
-    {
-     /* Return: 1=can apply the filter
-                0=cannot apply the filter 
-        Reset this object filter info 
-      */
-
-     options->op_tbl->objs[i].filter[j].filtn=-1;
-     options->op_tbl->objs[i].chunk.rank=-1;
-     printf(" Object <%s> cannot be filtered\n",name);
-
-
-    }
-     
-    }
-    break;
-   } /* switch */
-
-#endif
 
   } /* j */
  } /* i */