philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn-r24205] Merge HDFFV-8513/8522 from trunk (via cmake branch), h5repack UD plugins.

Browse Source 
Also warning session fixes.

Tested: CMake local linux
This commit is contained in:
Allen Byrne
2013-09-26 17:10:54 -05:00
parent e2dfb53df7
commit deddc7f955
45 changed files with 5392 additions and 4282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/lib/h5diff_array.c
View File

@@ -5757,14 +5757,14 @@ int ull2float(unsigned long long ull_value, float *f_value)
src_size = H5Tget_size(H5T_NATIVE_ULLONG);
dst_size = H5Tget_size(H5T_NATIVE_FLOAT);
buf = (unsigned char*)HDcalloc(1, MAX(src_size, dst_size));
buf = (unsigned char*)HDcalloc((size_t)1, MAX(src_size, dst_size));
if(!buf)
goto error;
HDmemcpy(buf, &ull_value, src_size);
/* do conversion */
if(H5Tconvert(H5T_NATIVE_ULLONG, H5T_NATIVE_FLOAT, 1, buf, NULL, dxpl_id)<0)
if(H5Tconvert(H5T_NATIVE_ULLONG, H5T_NATIVE_FLOAT, (size_t)1, buf, NULL, dxpl_id)<0)
goto error;
HDmemcpy(f_value, buf, dst_size);
@@ -6313,9 +6313,9 @@ static void get_member_types(hid_t tid, mcomp_t *members)
return;
members->n = (unsigned)nmembs;
members->ids = (hid_t *)HDcalloc(members->n, sizeof(hid_t));
members->offsets = (size_t *)HDcalloc(members->n, sizeof(size_t));
members->m = (mcomp_t **)HDcalloc(members->n, sizeof(mcomp_t *));
members->ids = (hid_t *)HDcalloc((size_t)members->n, sizeof(hid_t));
members->offsets = (size_t *)HDcalloc((size_t)members->n, sizeof(size_t));
members->m = (mcomp_t **)HDcalloc((size_t)members->n, sizeof(mcomp_t *));
for(u = 0; u < members->n; u++)
{