diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-01-11 15:13:05 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-01-11 15:13:05 (GMT) |
| commit | f5148618649e96f83578b0c415f69bb9016782df (patch) | |
| tree | ccf142d61c74b40b0dcad28b0b872706f1cdfc06 /tools/h5repack | |
| parent | dbe9c9f7dc95080eb1ad08702f880eda6b573ebd (diff) | |
| download | hdf5-f5148618649e96f83578b0c415f69bb9016782df.zip hdf5-f5148618649e96f83578b0c415f69bb9016782df.tar.gz hdf5-f5148618649e96f83578b0c415f69bb9016782df.tar.bz2 | |
HDFFV-8745 merge h5diff attribute fix
Diffstat (limited to 'tools/h5repack')
| -rw-r--r-- | tools/h5repack/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | tools/h5repack/h5repack_copy.c | 2 | ||||
| -rw-r--r-- | tools/h5repack/h5repack_filters.c | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/tools/h5repack/CMakeLists.txt b/tools/h5repack/CMakeLists.txt index 86611a9..4b15d7c 100644 --- a/tools/h5repack/CMakeLists.txt +++ b/tools/h5repack/CMakeLists.txt @@ -114,10 +114,9 @@ endif () # Rules for Installation of tools using make Install target #----------------------------------------------------------------------------- if (HDF5_EXPORTED_TARGETS) - if (BUILD_SHARED_LIBS) - INSTALL_PROGRAM_PDB (h5repack-shared ${HDF5_INSTALL_BIN_DIR} toolsapplications) - endif () - INSTALL_PROGRAM_PDB (h5repack ${HDF5_INSTALL_BIN_DIR} toolsapplications) + foreach (exec ${H5_DEP_EXECUTABLES}) + INSTALL_PROGRAM_PDB (${exec} ${HDF5_INSTALL_BIN_DIR} toolsapplications) + endforeach () install ( TARGETS diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c index 63233b8..a4f8f5b 100644 --- a/tools/h5repack/h5repack_copy.c +++ b/tools/h5repack/h5repack_copy.c @@ -882,7 +882,7 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, HDfree(buf); buf = NULL; } - } + } else { /* possibly not enough memory, read/write by hyperslabs */ size_t p_type_nbytes = msize; /*size of memory type */ hsize_t p_nelmts = nelmts; /*total elements */ diff --git a/tools/h5repack/h5repack_filters.c b/tools/h5repack/h5repack_filters.c index 523f81a..1371691 100644 --- a/tools/h5repack/h5repack_filters.c +++ b/tools/h5repack/h5repack_filters.c @@ -42,7 +42,7 @@ static int aux_copy_obj(hid_t dcpl_id, /* dataset creation property list */ H5D_layout_t layout; int rank; /* rank of dataset */ hsize_t chsize[64]; /* chunk size in elements */ - unsigned int i, j; + unsigned int i; /* get information about input filters */ if ((nfilters = H5Pget_nfilters(dcpl_id)) < 0) @@ -237,7 +237,7 @@ int apply_filters(const char* name, /* object name from traverse list */ int nfilters; /* number of filters in DCPL */ hsize_t chsize[64]; /* chunk size in elements */ H5D_layout_t layout; - int i, j; + int i; pack_info_t obj; pack_info_t filtobj; |