summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorPedro Vicente Nunes <pvn@hdfgroup.org>2008-01-03 19:59:25 (GMT)
committerPedro Vicente Nunes <pvn@hdfgroup.org>2008-01-03 19:59:25 (GMT)
commit5aab9089ded965796ca6e43ee3090f4f47fb970e (patch)
tree6da5fe1e19bfaa0d159caaff9492329adee5304e /tools
parent136cefdf9116b910b6a46f1f649ee8b9cdc7fc68 (diff)
downloadhdf5-5aab9089ded965796ca6e43ee3090f4f47fb970e.zip
hdf5-5aab9089ded965796ca6e43ee3090f4f47fb970e.tar.gz
hdf5-5aab9089ded965796ca6e43ee3090f4f47fb970e.tar.bz2
[svn-r14365] Add szip filter check of client data values for has_filters.
NOTE: szip client symbols were made public Tested: windows, linux, solaris
Diffstat (limited to 'tools')
-rw-r--r--tools/h5repack/h5repack_verify.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/tools/h5repack/h5repack_verify.c b/tools/h5repack/h5repack_verify.c
index 42e8683..9bb5443 100644
--- a/tools/h5repack/h5repack_verify.c
+++ b/tools/h5repack/h5repack_verify.c
@@ -507,18 +507,15 @@ static int has_filters(hid_t pid, hid_t tid, unsigned nfilters, filter_info_t *f
break;
case H5Z_FILTER_SZIP:
-
-#if 0
- /* 4 private client values are returned by DCPL */
- if ( f1.cd_nelmts != 4 && f2.cd_nelmts != 2 )
- return -1;
-
- if ( f2.cd_values[0] != f1.cd_values[2] &&
- f2.cd_values[1] != f1.cd_values[1] )
- return -1;
-#endif
-
+ /* 4 private client value is returned by DCPL */
+ if ( cd_nelmts != H5Z_SZIP_TOTAL_NPARMS && filter[i].cd_nelmts != H5Z_SZIP_USER_NPARMS )
+ return 0;
+
+ /* "User" parameter for pixels-per-block (index 1) */
+ if ( cd_values[H5Z_SZIP_PARM_PPB] != filter[i].cd_values[H5Z_SZIP_PARM_PPB] )
+ return 0;
+
break;