diff options
| author | Jonathan Kim <jkm@hdfgroup.org> | 2012-04-11 22:31:31 (GMT) |
|---|---|---|
| committer | Jonathan Kim <jkm@hdfgroup.org> | 2012-04-11 22:31:31 (GMT) |
| commit | f6fded4394644a3ea41dd3ca4bd659f9b5c4af15 (patch) | |
| tree | 6d1be60f806bbf306b6c17afbcdd2ef4f1577d26 /tools/h5repack/h5repack.c | |
| parent | 0627a640846494f56d585e23479cef2da91d19ce (diff) | |
| download | hdf5-f6fded4394644a3ea41dd3ca4bd659f9b5c4af15.zip hdf5-f6fded4394644a3ea41dd3ca4bd659f9b5c4af15.tar.gz hdf5-f6fded4394644a3ea41dd3ca4bd659f9b5c4af15.tar.bz2 | |
[svn-r22281] Purpose:
Fix for HDFFV-7993 - h5repack fails with error "chunk size must be <= maximum dimension size for fixed-sized dimensions"
Description:
Fixed a failure when change the chunk size of a specified chunked dataset with unlimited max dims.
Also took care of converting to contiguous and compact from the dataset.
Test cases were added and tagged with jira#.
Merged from HDF5 trunk r22277.
Tested:
jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), Windows (32-LE cmake), Cmake (jam)
Diffstat (limited to 'tools/h5repack/h5repack.c')
| -rw-r--r-- | tools/h5repack/h5repack.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/h5repack/h5repack.c b/tools/h5repack/h5repack.c index 27662e9..6517ae1 100644 --- a/tools/h5repack/h5repack.c +++ b/tools/h5repack/h5repack.c @@ -201,10 +201,12 @@ int h5repack_addlayout(const char* str, if (obj_list==NULL) return -1; - /* set global layout option */ + /* set layout option */ + options->layout_g = pack.layout; + + /* no individual dataset specified */ if (options->all_layout==1 ) { - options->layout_g=pack.layout; if (pack.layout==H5D_CHUNKED) { /* -2 means the NONE option, remove chunking @@ -223,6 +225,7 @@ int h5repack_addlayout(const char* str, } } + /* individual dataset specified */ if (options->all_layout==0) options_add_layout(obj_list, n_objs, @@ -499,7 +502,7 @@ int copy_attr(hid_t loc_in, if (type_class == H5T_COMPOUND) { int nmembers = H5Tget_nmembers(wtype_id) ; for (j=0; j<nmembers; j++) { - hid_t mtid = H5Tget_member_type( wtype_id, j ); + hid_t mtid = H5Tget_member_type( wtype_id, (unsigned) j ); H5T_class_t mtclass = H5Tget_class(mtid); H5Tclose(mtid); |