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/lib/h5diff_dset.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/lib/h5diff_dset.c')
-rw-r--r-- | tools/lib/h5diff_dset.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c index 230e7bb..c26c766 100644 --- a/tools/lib/h5diff_dset.c +++ b/tools/lib/h5diff_dset.c @@ -327,7 +327,7 @@ hsize_t diff_datasetid( hid_t did1, can_compare=0; options->not_cmp=1; } - + /* Check if type is either VLEN-data or VLEN-string to reclaim any * VLEN memory buffer later */ if( TRUE == h5tools_detect_vlen(m_tid1) ) @@ -390,7 +390,6 @@ hsize_t diff_datasetid( hid_t did1, * read/compare *------------------------------------------------------------------------- */ - need = (size_t)(nelmts1 * m_size1); /* bytes needed */ if(need < H5TOOLS_MALLOCSIZE) { buf1 = HDmalloc(need); @@ -562,7 +561,7 @@ error: if (buf1!=NULL) { /* reclaim any VL memory, if necessary */ - if(vl_data) + if(vl_data) H5Dvlen_reclaim(m_tid1, sid1, H5P_DEFAULT, buf1); free(buf1); buf1=NULL; @@ -570,7 +569,7 @@ error: if (buf2!=NULL) { /* reclaim any VL memory, if necessary */ - if(vl_data) + if(vl_data) H5Dvlen_reclaim(m_tid2, sid2, H5P_DEFAULT, buf2); free(buf2); buf2=NULL; |