diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2005-09-12 16:26:29 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2005-09-12 16:26:29 (GMT) |
| commit | b55f9a0ada06a324af19c957bd2ce9d92ab053bb (patch) | |
| tree | c97b762fd550b232bb384baa2d0f03de79225bce | |
| parent | 5ad2673fdec68bfe0ba90bce77fc5ec6017693b9 (diff) | |
| download | hdf5-b55f9a0ada06a324af19c957bd2ce9d92ab053bb.zip hdf5-b55f9a0ada06a324af19c957bd2ce9d92ab053bb.tar.gz hdf5-b55f9a0ada06a324af19c957bd2ce9d92ab053bb.tar.bz2 | |
[svn-r11388] Purpose:
bug fix
Description:
during the generation of some test files, H5Fclose was not called
during the #ifdef detection of the scale ofsset filter, a wrong macro symbol was used
Solution:
Platforms tested:
linux
Misc. update:
| -rw-r--r-- | tools/h5repack/h5repack.h | 14 | ||||
| -rw-r--r-- | tools/h5repack/testh5repack_make.c | 8 |
2 files changed, 13 insertions, 9 deletions
diff --git a/tools/h5repack/h5repack.h b/tools/h5repack/h5repack.h index fb99718..0ced373 100644 --- a/tools/h5repack/h5repack.h +++ b/tools/h5repack/h5repack.h @@ -271,15 +271,15 @@ int parse_number(char *str); #define FNAME9 "test_shuffle.h5" #define FNAME10 "test_fletcher32.h5" #define FNAME11 "test_all.h5" -#define FNAME7OUT "test_szip.out.h5" -#define FNAME8OUT "test_deflate.out.h5" -#define FNAME9OUT "test_shuffle.out.h5" -#define FNAME10OUT "test_fletcher32.out.h5" -#define FNAME11OUT "test_all.out.h5" +#define FNAME7OUT "test_szip.out.h5" +#define FNAME8OUT "test_deflate.out.h5" +#define FNAME9OUT "test_shuffle.out.h5" +#define FNAME10OUT "test_fletcher32.out.h5" +#define FNAME11OUT "test_all.out.h5" #define FNAME12 "test_nbit.h5" -#define FNAME12OUT "test_nbit.out.h5" +#define FNAME12OUT "test_nbit.out.h5" #define FNAME13 "test_scaleoffset.h5" -#define FNAME13OUT "test_scaleoffset.out.h5" +#define FNAME13OUT "test_scaleoffset.out.h5" int make_testfiles(void); diff --git a/tools/h5repack/testh5repack_make.c b/tools/h5repack/testh5repack_make.c index 5213043..247d606 100644 --- a/tools/h5repack/testh5repack_make.c +++ b/tools/h5repack/testh5repack_make.c @@ -167,6 +167,8 @@ int make_testfiles(void) return -1; if (make_nbit(loc_id)<0) goto out; + if(H5Fclose(loc_id)<0) + return -1; /*------------------------------------------------------------------------- * create a file with the scaleoffset filter @@ -176,9 +178,11 @@ int make_testfiles(void) return -1; if (make_scaleoffset(loc_id)<0) goto out; + if(H5Fclose(loc_id)<0) + return -1; /*------------------------------------------------------------------------- - * create a file with the all filters + * create a file with all the filters *------------------------------------------------------------------------- */ if((loc_id = H5Fcreate(FNAME11,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT))<0) @@ -779,7 +783,7 @@ int make_scaleoffset(hid_t loc_id) dtid = H5Tcopy(H5T_NATIVE_INT); -#if defined (H5_HAVE_FILTER_NBIT) +#if defined (H5_HAVE_FILTER_SCALEOFFSET) /* remove the filters from the dcpl */ if (H5Premove_filter(dcpl,H5Z_FILTER_ALL)<0) { |