[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)
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user