diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2008-02-12 20:36:48 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2008-02-12 20:36:48 (GMT) |
| commit | 54a5561c78a2a229075b84219c883a38e28e5690 (patch) | |
| tree | 5c3f5a4e9f562c6ff489bf3a85e00de67bc4e830 /src | |
| parent | d48aa9b23663ebfcd21942d5bf5cd967aa760e88 (diff) | |
| download | hdf5-54a5561c78a2a229075b84219c883a38e28e5690.zip hdf5-54a5561c78a2a229075b84219c883a38e28e5690.tar.gz hdf5-54a5561c78a2a229075b84219c883a38e28e5690.tar.bz2 | |
[svn-r14557] 1st batch of commits regarding making 1.6 h5repack like 1.8
1) have several global filters
2) do a check on the verify code about private filter values
Note: some shuffle and szip private symbols were made public
tested: windows, linux, solaris
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Zpublic.h | 14 | ||||
| -rw-r--r-- | src/H5Zshuffle.c | 2 | ||||
| -rw-r--r-- | src/H5Zszip.c | 7 |
3 files changed, 14 insertions, 9 deletions
diff --git a/src/H5Zpublic.h b/src/H5Zpublic.h index cb03ba7..accd763 100644 --- a/src/H5Zpublic.h +++ b/src/H5Zpublic.h @@ -62,6 +62,20 @@ typedef int H5Z_filter_t; #define H5_SZIP_NN_OPTION_MASK 32 #define H5_SZIP_MAX_PIXELS_PER_BLOCK 32 +/* Macros for the shuffle filter */ +#define H5Z_SHUFFLE_USER_NPARMS 0 /* Number of parameters that users can set */ +#define H5Z_SHUFFLE_TOTAL_NPARMS 1 /* Total number of parameters for filter */ + +/* 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 */ + + + /* Values to decide if EDC is enabled for reading data */ typedef enum H5Z_EDC_t { H5Z_ERROR_EDC = -1, /* error value */ diff --git a/src/H5Zshuffle.c b/src/H5Zshuffle.c index c714cc9..83e5f40 100644 --- a/src/H5Zshuffle.c +++ b/src/H5Zshuffle.c @@ -40,8 +40,6 @@ const H5Z_class_t H5Z_SHUFFLE[1] = {{ }}; /* Local macros */ -#define H5Z_SHUFFLE_USER_NPARMS 0 /* Number of parameters that users can set */ -#define H5Z_SHUFFLE_TOTAL_NPARMS 1 /* Total number of parameters for filter */ #define H5Z_SHUFFLE_PARM_SIZE 0 /* "Local" parameter for shuffling size */ diff --git a/src/H5Zszip.c b/src/H5Zszip.c index 62cc461..07f784f 100644 --- a/src/H5Zszip.c +++ b/src/H5Zszip.c @@ -46,13 +46,6 @@ const 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 */ /*------------------------------------------------------------------------- |