diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2008-01-03 19:59:25 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2008-01-03 19:59:25 (GMT) |
| commit | 5aab9089ded965796ca6e43ee3090f4f47fb970e (patch) | |
| tree | 6da5fe1e19bfaa0d159caaff9492329adee5304e /src | |
| parent | 136cefdf9116b910b6a46f1f649ee8b9cdc7fc68 (diff) | |
| download | hdf5-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 'src')
| -rw-r--r-- | src/H5Zpublic.h | 13 | ||||
| -rw-r--r-- | src/H5Zszip.c | 7 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/H5Zpublic.h b/src/H5Zpublic.h index 6c238fe..df02af8 100644 --- a/src/H5Zpublic.h +++ b/src/H5Zpublic.h @@ -74,8 +74,17 @@ typedef int H5Z_filter_t; #define H5_SZIP_NN_OPTION_MASK 32 #define H5_SZIP_MAX_PIXELS_PER_BLOCK 32 -/* Total number of parameters for the shuffle filter, private */ -#define H5Z_SHUFFLE_TOTAL_NPARMS 1 +/* Total number of parameters for the shuffle filter */ +#define H5Z_SHUFFLE_TOTAL_NPARMS 1 + +/* Macros for the szip filter */ +#define H5Z_SZIP_USER_NPARMS 2 /* Number of parameters that users can set */ +#define H5Z_SZIP_TOTAL_NPARMS 4 /* Total number of parameters for filter */ +#define H5Z_SZIP_PARM_MASK 0 /* "User" parameter for option mask */ +#define H5Z_SZIP_PARM_PPB 1 /* "User" parameter for pixels-per-block */ +#define H5Z_SZIP_PARM_BPP 2 /* "Local" parameter for bits-per-pixel */ +#define H5Z_SZIP_PARM_PPS 3 /* "Local" parameter for pixels-per-scanline */ + /* Special parameters for ScaleOffset filter*/ diff --git a/src/H5Zszip.c b/src/H5Zszip.c index cdc26aa..9201a80 100644 --- a/src/H5Zszip.c +++ b/src/H5Zszip.c @@ -51,13 +51,6 @@ H5Z_class_t H5Z_SZIP[1] = {{ H5Z_filter_szip, /* The actual filter function */ }}; -/* Local macros */ -#define H5Z_SZIP_USER_NPARMS 2 /* Number of parameters that users can set */ -#define H5Z_SZIP_TOTAL_NPARMS 4 /* Total number of parameters for filter */ -#define H5Z_SZIP_PARM_MASK 0 /* "User" parameter for option mask */ -#define H5Z_SZIP_PARM_PPB 1 /* "User" parameter for pixels-per-block */ -#define H5Z_SZIP_PARM_BPP 2 /* "Local" parameter for bits-per-pixel */ -#define H5Z_SZIP_PARM_PPS 3 /* "Local" parameter for pixels-per-scanline */ /*------------------------------------------------------------------------- |