diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2015-03-11 09:59:37 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2015-03-11 09:59:37 (GMT) |
commit | 77f1054b3d34e2ee65de389bd8588c031db7db1f (patch) | |
tree | 0490d5dc58b82e4db0b3fbd3fd4cf28845bde943 /hl/src/H5IM.c | |
parent | 52896a9f015ce685e00c72dba3aff146ebc3df49 (diff) | |
parent | 88ac8e8929f6fd99732a1e08ced4ea82bfb230f1 (diff) | |
download | hdf5-77f1054b3d34e2ee65de389bd8588c031db7db1f.zip hdf5-77f1054b3d34e2ee65de389bd8588c031db7db1f.tar.gz hdf5-77f1054b3d34e2ee65de389bd8588c031db7db1f.tar.bz2 |
[svn-r26429] Merge of r26393-26428 from the trunk.
Tested w/ h5committest
Diffstat (limited to 'hl/src/H5IM.c')
-rw-r--r-- | hl/src/H5IM.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/hl/src/H5IM.c b/hl/src/H5IM.c index aeda6ab..6fa548d 100644 --- a/hl/src/H5IM.c +++ b/hl/src/H5IM.c @@ -628,9 +628,9 @@ herr_t H5IMlink_palette( hid_t loc_id, n_refs = H5Sget_simple_extent_npoints(asid); - dim_ref = n_refs + 1; + dim_ref = (hsize_t)n_refs + 1; - refbuf = (hobj_ref_t*)HDmalloc( sizeof(hobj_ref_t) * (int)dim_ref ); + refbuf = (hobj_ref_t*)HDmalloc( sizeof(hobj_ref_t) * (size_t)dim_ref ); if ( H5Aread( aid, atid, refbuf ) < 0) goto out; @@ -949,9 +949,9 @@ herr_t H5IMget_palette_info( hid_t loc_id, n_refs = H5Sget_simple_extent_npoints(asid); - dim_ref = n_refs; + dim_ref = (hsize_t)n_refs; - refbuf = (hobj_ref_t*)HDmalloc( sizeof(hobj_ref_t) * (int)dim_ref ); + refbuf = (hobj_ref_t*)HDmalloc( sizeof(hobj_ref_t) * (size_t)dim_ref ); if ( H5Aread( aid, atid, refbuf ) < 0) goto out; @@ -1067,9 +1067,9 @@ herr_t H5IMget_palette( hid_t loc_id, n_refs = H5Sget_simple_extent_npoints(asid); - dim_ref = n_refs; + dim_ref = (hsize_t)n_refs; - refbuf = (hobj_ref_t*)HDmalloc( sizeof(hobj_ref_t) * (int)dim_ref ); + refbuf = (hobj_ref_t*)HDmalloc( sizeof(hobj_ref_t) * (size_t)dim_ref ); if ( H5Aread( aid, atid, refbuf ) < 0) goto out; |