diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-09-22 19:25:12 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-09-22 19:25:12 (GMT) |
| commit | a2f7a8f34be5618880a0a965e3d9a2489c266029 (patch) | |
| tree | 3a7ee8b5460333ae76a30a9573ecb60018caef4a /src/H5Pdcpl.c | |
| parent | 476b31d101564d04baba2caec114f1507cbe9c38 (diff) | |
| download | hdf5-a2f7a8f34be5618880a0a965e3d9a2489c266029.zip hdf5-a2f7a8f34be5618880a0a965e3d9a2489c266029.tar.gz hdf5-a2f7a8f34be5618880a0a965e3d9a2489c266029.tar.bz2 | |
[svn-r27857] Merged revisions 27612-4, 27618, 27663, 27682, 27728 from the trunk.
Tested on: jam (w/ gcc/gfortran 4.9.3)
Diffstat (limited to 'src/H5Pdcpl.c')
| -rw-r--r-- | src/H5Pdcpl.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c index 9ae979c..eb1953a 100644 --- a/src/H5Pdcpl.c +++ b/src/H5Pdcpl.c @@ -479,7 +479,7 @@ static herr_t H5P__dcrt_layout_dec(const void **_pp, void *value) { const H5O_layout_t *layout; /* Storage layout */ - H5O_layout_t chunk_layout; /* Layout structure for chunk info */ + H5O_layout_t tmp_layout; /* Temporary local layout structure */ H5D_layout_t type; /* Layout type */ const uint8_t **pp = (const uint8_t **)_pp; herr_t ret_value = SUCCEED; /* Return value */ @@ -519,15 +519,15 @@ H5P__dcrt_layout_dec(const void **_pp, void *value) unsigned u; /* Local index variable */ /* Initialize to default values */ - chunk_layout = H5D_def_layout_chunk_g; + tmp_layout = H5D_def_layout_chunk_g; /* Set rank & dimensions */ - chunk_layout.u.chunk.ndims = (unsigned)ndims; + tmp_layout.u.chunk.ndims = (unsigned)ndims; for(u = 0; u < ndims; u++) - UINT32DECODE(*pp, chunk_layout.u.chunk.dim[u]) + UINT32DECODE(*pp, tmp_layout.u.chunk.dim[u]) /* Point at the newly set up struct */ - layout = &chunk_layout; + layout = &tmp_layout; } /* end else */ } break; @@ -1186,8 +1186,10 @@ H5P__init_def_layout(void) FUNC_ENTER_STATIC_NOERR /* Initialize the default layout info for non-contigous layouts */ + H5D_def_layout_compact_g.storage.type = H5D_COMPACT; H5D_def_layout_compact_g.storage.u.compact = def_store_compact; H5D_def_layout_chunk_g.u.chunk = def_layout_chunk; + H5D_def_layout_chunk_g.storage.type = H5D_CHUNKED; H5D_def_layout_chunk_g.storage.u.chunk = def_store_chunk; /* Note that we've initialized the default values */ |