diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-03-25 16:21:30 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-03-25 16:21:30 (GMT) |
| commit | 1361515c5198b0144097701a5c232e48ddd4a865 (patch) | |
| tree | 1754214e888fba8098e6844bb027800c5a23c3ac /hl/src/H5IM.c | |
| parent | 3898ea081a0bd34b4f30a7aeec88ac1431e9c4a5 (diff) | |
| download | hdf5-1361515c5198b0144097701a5c232e48ddd4a865.zip hdf5-1361515c5198b0144097701a5c232e48ddd4a865.tar.gz hdf5-1361515c5198b0144097701a5c232e48ddd4a865.tar.bz2 | |
[svn-r26576] Merged r26321,r26405,r26417 from the trunk into the branch.
Tested: 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 33b2dd4..774ce2f 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; |