diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2015-09-22 00:26:51 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-09-22 00:26:51 (GMT) |
| commit | fb238c24a5c6679c7555c95f887b7f4a49dbb640 (patch) | |
| tree | f3d4107271fa1c56c9a9beae272653acb95d5527 /src/H5Dlayout.c | |
| parent | 0be8c1687945eb0e55fac84c7aa9901ca9898a26 (diff) | |
| download | hdf5-fb238c24a5c6679c7555c95f887b7f4a49dbb640.zip hdf5-fb238c24a5c6679c7555c95f887b7f4a49dbb640.tar.gz hdf5-fb238c24a5c6679c7555c95f887b7f4a49dbb640.tar.bz2 | |
[svn-r27849] Description:
Normalize against incoming changes on VDS branch.
Tested on:
MacOSX/64 10.10.5 (amazon) w/serial
(h5committest forthcoming)
Diffstat (limited to 'src/H5Dlayout.c')
| -rw-r--r-- | src/H5Dlayout.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Dlayout.c b/src/H5Dlayout.c index d0e9d07..c2d547f 100644 --- a/src/H5Dlayout.c +++ b/src/H5Dlayout.c @@ -370,6 +370,10 @@ H5D__layout_oh_read(H5D_t *dataset, hid_t dxpl_id, hid_t dapl_id, H5P_genplist_t /* Sanity check that the layout operations are set up */ HDassert(dataset->shared->layout.ops); + /* Initialize the layout information for the dataset */ + if(dataset->shared->layout.ops->init && (dataset->shared->layout.ops->init)(dataset->oloc.file, dxpl_id, dataset, dapl_id) < 0) + HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize layout information") + /* Adjust chunk dimensions to omit datatype size (in last dimension) for creation property */ if(H5D_CHUNKED == dataset->shared->layout.type) dataset->shared->layout.u.chunk.ndims--; @@ -380,10 +384,6 @@ H5D__layout_oh_read(H5D_t *dataset, hid_t dxpl_id, hid_t dapl_id, H5P_genplist_t if(H5D_CHUNKED == dataset->shared->layout.type) dataset->shared->layout.u.chunk.ndims++; - /* Initialize the layout information for the dataset */ - if(dataset->shared->layout.ops->init && (dataset->shared->layout.ops->init)(dataset->oloc.file, dxpl_id, dataset, dapl_id) < 0) - HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize layout information") - done: FUNC_LEAVE_NOAPI(ret_value) } /* end H5D__layout_oh_read() */ |