diff options
| author | James Laird <jlaird@hdfgroup.org> | 2004-06-30 19:12:22 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2004-06-30 19:12:22 (GMT) |
| commit | 10834e1e8f3dee6f863d655d4eddf0c824a94fd6 (patch) | |
| tree | d474b2499576a64b9814f36705a3afbcde17c9a5 | |
| parent | 822af258c70d179058b402e9955d07eee3527f5a (diff) | |
| download | hdf5-10834e1e8f3dee6f863d655d4eddf0c824a94fd6.zip hdf5-10834e1e8f3dee6f863d655d4eddf0c824a94fd6.tar.gz hdf5-10834e1e8f3dee6f863d655d4eddf0c824a94fd6.tar.bz2 | |
[svn-r8775]
Purpose:
Fixed a bug that broke daily tests.
SZIP now always uses K13 compression.
Description:
When configured with the --srcdir option, dsets test would look for
a test file in the same directory as the test, instead of in the
directory that contains the source files.
SZIP never needs to use CHIP compression, so the option to set this flag
instead of K13 compression has been removed.
Platforms tested:
Copper
| -rw-r--r-- | release_docs/RELEASE.txt | 10 | ||||
| -rw-r--r-- | src/H5Pdcpl.c | 4 | ||||
| -rw-r--r-- | test/dsets.c | 13 |
3 files changed, 25 insertions, 2 deletions
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 58d0e3f..e02a828 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -49,7 +49,15 @@ New Features - Added option that if $HDF5_DISABLE_VERSION_CHECK is set to 2, will suppress all library version mismatch warning messages. AKC - 2004/4/14 - + - HDF5 can now link to SZIP with or without szip's encoder. + The new API function H5Zget_filter_info can be used to check + szip's status. Attempting to assign szip to a dataset property + list or attempting to write with szip will generate an error if + szip's encoder is disabled. JL/NF - 2004/6/30 + - SZIP always uses K13 compression. This flag no longer needs to + be set when calling H5Pset_szip. If the flag for CHIP + compression is set, it will be ignored (since the two are mutually + exclusive). JL/NF - 2004/6/30 Parallel Library: ----------------- diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c index 5db7a03..e7c1152 100644 --- a/src/H5Pdcpl.c +++ b/src/H5Pdcpl.c @@ -1033,6 +1033,10 @@ H5Pset_szip(hid_t plist_id, unsigned options_mask, unsigned pixels_per_block) if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_CREATE))) HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID"); + /* Always set K13 compression (and un-set CHIP compression) */ + options_mask &= (~H5_SZIP_CHIP_OPTION_MASK); + options_mask |= H5_SZIP_ALLOW_K13_OPTION_MASK; + /* Always set "raw" (no szip header) flag for data */ options_mask |= H5_SZIP_RAW_OPTION_MASK; diff --git a/test/dsets.c b/test/dsets.c index ee9194b..09587f5 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -1649,8 +1649,19 @@ test_filter_noencoder(const char *dset_name) int test_ints[10] = { 12 }; int read_buf[10]; int i; + char * srcdir = HDgetenv("srcdir"); /* The source directory */ + char testfile[512]=""; /* Buffer to hold name of test file */ + + /* Create the name of the file to open (in case we are using the --srcdir + * option. */ + if (srcdir && ((HDstrlen(srcdir) + HDstrlen(NOENCODER_FILENAME) + 1) < sizeof(testfile)) ) + { + HDstrcpy(testfile, srcdir); + HDstrcat(testfile, "/"); + } + HDstrcat(testfile, NOENCODER_FILENAME); - file_id = H5Fopen(NOENCODER_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT); + file_id = H5Fopen(testfile, H5F_ACC_RDWR, H5P_DEFAULT); if (file_id < 0) goto error; dset_id = H5Dopen(file_id, dset_name); |