summaryrefslogtreecommitdiffstats
path: root/tools/h5repack
diff options
context:
space:
mode:
authorPeter Cao <xcao@hdfgroup.org>2011-07-15 23:02:50 (GMT)
committerPeter Cao <xcao@hdfgroup.org>2011-07-15 23:02:50 (GMT)
commit877b7aed1b543d2e7fde2d9c2c2eda325d3894c0 (patch)
tree9eaa4845a0a330a3f73ebb6b2cd995232c61898a /tools/h5repack
parentdc9288a44706fa89558d218325f34dbfdad31d07 (diff)
downloadhdf5-877b7aed1b543d2e7fde2d9c2c2eda325d3894c0.zip
hdf5-877b7aed1b543d2e7fde2d9c2c2eda325d3894c0.tar.gz
hdf5-877b7aed1b543d2e7fde2d9c2c2eda325d3894c0.tar.bz2
[svn-r21105] Fixed two bugs:
- h5repack: h5repack failed to copy dataset if the layout is changed from chunked 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)
Diffstat (limited to 'tools/h5repack')
-rw-r--r--tools/h5repack/h5repack_copy.c5
-rw-r--r--tools/h5repack/testfiles/h5repack_layout.h5bin29384 -> 27280 bytes
2 files changed, 5 insertions, 0 deletions
diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c
index 5153cc4..0e9d1dd 100644
--- a/tools/h5repack/h5repack_copy.c
+++ b/tools/h5repack/h5repack_copy.c
@@ -808,6 +808,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
diff --git a/tools/h5repack/testfiles/h5repack_layout.h5 b/tools/h5repack/testfiles/h5repack_layout.h5
index 5772a31..2cc44b1 100644
--- a/tools/h5repack/testfiles/h5repack_layout.h5
+++ b/tools/h5repack/testfiles/h5repack_layout.h5
Binary files differ