mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-31 17:10:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r14345] substituted the symbol CD_VALUES , number of filter client data values, for H5Z_COMMON_CD_VALUES

Browse Source 
that is defined in the library

tested: windows, linux, solaris
This commit is contained in:
Pedro Vicente Nunes 2007-12-14 14:16:01 -05:00
parent 619e6d1cb1
commit 89f6ef0303
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/h5repack/h5repack.c
View File

@ -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;
}

10
tools/h5repack/h5repack.h
View File

@ -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 */

2
tools/h5repack/h5repack_opttable.c
View File

@ -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;