diff options
| author | Jonathan Kim <jkm@hdfgroup.org> | 2011-07-26 15:20:51 (GMT) |
|---|---|---|
| committer | Jonathan Kim <jkm@hdfgroup.org> | 2011-07-26 15:20:51 (GMT) |
| commit | 0069b4b190cb654706d325487caa91a6ad93dc31 (patch) | |
| tree | b3c0c8cfcaae4757116133589b323bf8a37bb514 /tools/h5repack/h5repack_copy.c | |
| parent | e71268c120e361e8eff4670610d49da417c7925a (diff) | |
| download | hdf5-0069b4b190cb654706d325487caa91a6ad93dc31.zip hdf5-0069b4b190cb654706d325487caa91a6ad93dc31.tar.gz hdf5-0069b4b190cb654706d325487caa91a6ad93dc31.tar.bz2 | |
[svn-r21151] Description:
Merged from HDF5 trunk r21105
Fixed two bugs:
- h5repack: h5repack failed to copy dataset if the layout is changed from c
hunked with unlimited dims to contiguous. (PC -- 2011/07/15)
- h5diff: "--delta" option considers two NaN of the same type are different
, which is wrong based on http://www.hdfgroup.org/HDF5/doc/RM/Tools.html#Tools-Diff. (PC -- 2011/07/15)
Tested:
jam (linux32-LE), koala (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE)
Diffstat (limited to 'tools/h5repack/h5repack_copy.c')
| -rw-r--r-- | tools/h5repack/h5repack_copy.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c index 765fd57..56371cc 100644 --- a/tools/h5repack/h5repack_copy.c +++ b/tools/h5repack/h5repack_copy.c @@ -764,6 +764,11 @@ int do_copy_objects(hid_t fidin, goto error; } + /* unset the unlimimted dimensions, which cannot be applied to layout other than chunked. */ + if (options->layout_g != H5D_CHUNKED) { + H5Sset_extent_simple( f_space_id, rank, dims, NULL ); + } + /*------------------------------------------------------------------------- * create the output dataset; * disable error checking in case the dataset cannot be created with the |