diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2008-01-07 19:16:29 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2008-01-07 19:16:29 (GMT) |
| commit | 20c5484440dd9427c23afec554249ff165abf6a9 (patch) | |
| tree | 3183db94f680c23608d68dbeb86c46ca5ebc4048 /src | |
| parent | dfbeb73b48df220165b528d3df2abcea2e2a4802 (diff) | |
| download | hdf5-20c5484440dd9427c23afec554249ff165abf6a9.zip hdf5-20c5484440dd9427c23afec554249ff165abf6a9.tar.gz hdf5-20c5484440dd9427c23afec554249ff165abf6a9.tar.bz2 | |
[svn-r14379] add check of some values for the nbit and scale offest filters on the h5repack verify function
note: some sybols were made public
tested: windows, linux
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Znbit.c | 1 | ||||
| -rw-r--r-- | src/H5Zpublic.h | 5 | ||||
| -rw-r--r-- | src/H5Zscaleoffset.c | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/H5Znbit.c b/src/H5Znbit.c index 8f95006..1b9265d 100644 --- a/src/H5Znbit.c +++ b/src/H5Znbit.c @@ -96,7 +96,6 @@ H5Z_class_t H5Z_NBIT[1] = {{ #define H5Z_NBIT_ARRAY 2 /* Array datatype class */ #define H5Z_NBIT_COMPOUND 3 /* Compound datatype class */ #define H5Z_NBIT_NOOPTYPE 4 /* Other datatype class: nbit does no compression */ -#define H5Z_NBIT_USER_NPARMS 0 /* Number of parameters that users can set */ #define H5Z_NBIT_MAX_NPARMS 4096 /* Max number of parameters for filter */ #define H5Z_NBIT_ORDER_LE 0 /* Little endian for datatype byte order */ #define H5Z_NBIT_ORDER_BE 1 /* Big endian for datatype byte order */ diff --git a/src/H5Zpublic.h b/src/H5Zpublic.h index a671d1a..7211a2b 100644 --- a/src/H5Zpublic.h +++ b/src/H5Zpublic.h @@ -86,6 +86,11 @@ typedef int H5Z_filter_t; #define H5Z_SZIP_PARM_BPP 2 /* "Local" parameter for bits-per-pixel */ #define H5Z_SZIP_PARM_PPS 3 /* "Local" parameter for pixels-per-scanline */ +/* Macros for the nbit filter */ +#define H5Z_NBIT_USER_NPARMS 0 /* Number of parameters that users can set */ + +/* Macros for the scale offset filter */ +#define H5Z_SCALEOFFSET_USER_NPARMS 2 /* Number of parameters that users can set */ /* Special parameters for ScaleOffset filter*/ diff --git a/src/H5Zscaleoffset.c b/src/H5Zscaleoffset.c index 7482275..84d404e 100644 --- a/src/H5Zscaleoffset.c +++ b/src/H5Zscaleoffset.c @@ -92,7 +92,6 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{ }}; /* Local macros */ -#define H5Z_SCALEOFFSET_USER_NPARMS 2 /* Number of parameters that users can set */ #define H5Z_SCALEOFFSET_TOTAL_NPARMS 20 /* Total number of parameters for filter */ #define H5Z_SCALEOFFSET_PARM_SCALETYPE 0 /* "User" parameter for scale type */ #define H5Z_SCALEOFFSET_PARM_SCALEFACTOR 1 /* "User" parameter for scale factor */ |