diff options
| -rw-r--r-- | tools/h5repack/h5repack.c | 2 | ||||
| -rw-r--r-- | tools/h5repack/h5repack.h | 10 | ||||
| -rw-r--r-- | tools/h5repack/h5repack_opttable.c | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/tools/h5repack/h5repack.c b/tools/h5repack/h5repack.c index 374a53a..f99e4aa 100644 --- a/tools/h5repack/h5repack.c +++ b/tools/h5repack/h5repack.c @@ -102,7 +102,7 @@ int h5repack_init (pack_opt_t *options, { options->filter_g[n].filtn = -1; options->filter_g[n].cd_nelmts = -1; - for ( k = 0; k < CDVALUES; k++) + for ( k = 0; k < H5Z_COMMON_CD_VALUES; k++) options->filter_g[n].cd_values[k] = -1; } diff --git a/tools/h5repack/h5repack.h b/tools/h5repack/h5repack.h index 018fd5f..a608625 100644 --- a/tools/h5repack/h5repack.h +++ b/tools/h5repack/h5repack.h @@ -19,6 +19,8 @@ #include "hdf5.h" #include "h5trav.h" +#include "H5Zprivate.h" /* H5Z_COMMON_CD_VALUES */ + #define H5FOPENERROR "unable to open file" @@ -51,12 +53,12 @@ typedef struct { H5Z_FILTER_SCALEOFFSET 6 , scaleoffset compression */ -#define CDVALUES 4 /* SZIP returns 4 values */ + typedef struct { - H5Z_filter_t filtn; /* filter identification number */ - int cd_values[CDVALUES]; /* filter client data values */ - size_t cd_nelmts; /* filter client number of values */ + H5Z_filter_t filtn; /* filter identification number */ + int cd_values[H5Z_COMMON_CD_VALUES]; /* filter client data values */ + size_t cd_nelmts; /* filter client number of values */ } filter_info_t; /* chunk lengths along each dimension and rank */ diff --git a/tools/h5repack/h5repack_opttable.c b/tools/h5repack/h5repack_opttable.c index b740274..d37ff4d 100644 --- a/tools/h5repack/h5repack_opttable.c +++ b/tools/h5repack/h5repack_opttable.c @@ -38,7 +38,7 @@ void init_packobject(pack_info_t *obj) for ( j=0; j<H5_REPACK_MAX_NFILTERS; j++) { obj->filter[j].filtn = -1; - for ( k=0; k<CDVALUES; k++) + for ( k=0; k<H5Z_COMMON_CD_VALUES; k++) obj->filter[j].cd_values[k] = -1; } obj->chunk.rank = -1; |