diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2015-05-05 20:15:40 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2015-05-05 20:15:40 (GMT) |
| commit | 8fe3dfbf9410ad5acabeaeb187bfb5f7b489042e (patch) | |
| tree | 393d8485ce30da4ef690f7a1f7fc20a30347d9e4 /src/H5Shyper.c | |
| parent | 8ba06cb15e5bab3b49f210ff6d635d35fc4ed1ec (diff) | |
| download | hdf5-8fe3dfbf9410ad5acabeaeb187bfb5f7b489042e.zip hdf5-8fe3dfbf9410ad5acabeaeb187bfb5f7b489042e.tar.gz hdf5-8fe3dfbf9410ad5acabeaeb187bfb5f7b489042e.tar.bz2 | |
[svn-r27022] Add new functions H5Pset_virtual_dataspace_bounds and
H5Pget_virtual_dataspace_bounds.
Minor refactor of dataset initialization code to make this cleaner.
Update h5_vds-percival-unlim-maxmin.c
Other minor fixes/cleanup.
Tested: ummon
Diffstat (limited to 'src/H5Shyper.c')
| -rw-r--r-- | src/H5Shyper.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/src/H5Shyper.c b/src/H5Shyper.c index 9b854c0..5667cbd 100644 --- a/src/H5Shyper.c +++ b/src/H5Shyper.c @@ -1673,20 +1673,9 @@ H5S_hyper_copy (H5S_t *dst, const H5S_t *src, hbool_t share_selection) dst->select.sel_info.hslab->span_lst = H5S_hyper_copy_span(src->select.sel_info.hslab->span_lst); } /* end if */ - /* If there is an unlimited dimension, we must update the selection if the - * extent changed */ - if(dst_hslab->unlim_dim >= 0) { - htri_t extent_equal; - - /* Check if the extent changed */ - if((extent_equal = H5S_extent_equal(src, dst)) < 0) - HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOMPARE, FAIL, "dataspace comparison failed") - - if(!extent_equal) - /* Update selection due to changed extent */ - if(H5S_hyper_clip_to_extent(dst) < 0) - HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSET, FAIL, "can't update hyperslab") - } /* end if */ + /* If there is an unlimited dimension, we must update the selection */ + if(H5S_hyper_clip_to_extent(dst) < 0) + HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSET, FAIL, "can't update hyperslab") done: FUNC_LEAVE_NOAPI(ret_value) @@ -9843,14 +9832,12 @@ H5S_hyper_get_clip_extent(const H5S_t *clip_space, const H5S_t *match_space, + ((count - (hsize_t)1) * clip_hslab->opt_unlim_diminfo[clip_hslab->unlim_dim].stride) + clip_hslab->opt_unlim_diminfo[clip_hslab->unlim_dim].block; - if(clip_size_incl_trail) { - HDassert(0 && "Checking code coverage..."); //VDSINC + if(clip_size_incl_trail) /* Include gap after last block */ *clip_size_incl_trail = clip_hslab->opt_unlim_diminfo[clip_hslab->unlim_dim].start + (count * clip_hslab->opt_unlim_diminfo[clip_hslab->unlim_dim].stride); - } //VDSINC } /* end else */ } /* end else */ |