diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-30 03:48:44 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-30 03:48:44 (GMT) |
| commit | aaa84b4542fba4b3d8424bf494b311a8ab0dbd4c (patch) | |
| tree | b38d4820a999a8960164505dc020e3f6de30c85a /src/H5Olayout.c | |
| parent | 31a7cd56bfdb08646d9638fdabb576b3af38fc11 (diff) | |
| download | hdf5-aaa84b4542fba4b3d8424bf494b311a8ab0dbd4c.zip hdf5-aaa84b4542fba4b3d8424bf494b311a8ab0dbd4c.tar.gz hdf5-aaa84b4542fba4b3d8424bf494b311a8ab0dbd4c.tar.bz2 | |
[svn-r17274] Description:
Bring r17272 from trunk to 1.8 branch:
Finish pushing contiguous storage size from 'layout' into 'storage"
data structure.
Tested on:
Mac OS X/32 10.5.7 (amazon) w/debug & production
Too minor to require h5committest
Diffstat (limited to 'src/H5Olayout.c')
| -rw-r--r-- | src/H5Olayout.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Olayout.c b/src/H5Olayout.c index 8c3e266..919dceb 100644 --- a/src/H5Olayout.c +++ b/src/H5Olayout.c @@ -206,7 +206,7 @@ H5O_layout_decode(H5F_t *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh, case H5D_CONTIGUOUS: H5F_addr_decode(f, &p, &(mesg->store.u.contig.addr)); - H5F_DECODE_LENGTH(f, p, mesg->u.contig.size); + H5F_DECODE_LENGTH(f, p, mesg->store.u.contig.size); /* Set the layout operations */ mesg->ops = H5D_LOPS_CONTIG; @@ -323,7 +323,7 @@ H5O_layout_encode(H5F_t *f, hbool_t UNUSED disable_shared, uint8_t *p, const voi case H5D_CONTIGUOUS: H5F_addr_encode(f, &p, mesg->store.u.contig.addr); - H5F_ENCODE_LENGTH(f, p, mesg->u.contig.size); + H5F_ENCODE_LENGTH(f, p, mesg->store.u.contig.size); break; case H5D_CHUNKED: @@ -616,7 +616,7 @@ H5O_layout_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst, * truncate the dimension sizes to 32-bits of information. - QAK 5/26/04 */ if(layout_src->version < 3) - layout_dst->u.contig.size = H5S_extent_nelem(udata->src_space_extent) * + layout_dst->store.u.contig.size = H5S_extent_nelem(udata->src_space_extent) * H5T_get_size(udata->src_dtype); if(H5F_addr_defined(layout_src->store.u.contig.addr)) { @@ -721,7 +721,7 @@ H5O_layout_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth, "Data address:", mesg->store.u.contig.addr); HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth, - "Data Size:", mesg->u.contig.size); + "Data Size:", mesg->store.u.contig.size); break; case H5D_COMPACT: |