diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2015-05-12 15:39:10 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2015-05-12 15:39:10 (GMT) |
| commit | f7e10b55ab75857e8a5bade01749842b060b5783 (patch) | |
| tree | b2bcc608e40f5fdb86afdd971e36531638266e82 /src | |
| parent | 5b92a99024214884428796394fef7376c2d09f3f (diff) | |
| download | hdf5-f7e10b55ab75857e8a5bade01749842b060b5783.zip hdf5-f7e10b55ab75857e8a5bade01749842b060b5783.tar.gz hdf5-f7e10b55ab75857e8a5bade01749842b060b5783.tar.bz2 | |
[svn-r27053] Add more tests for unlimited selections.
Fix off by 1 error involving minimum extent of VDS.
Other minor fixes/cleanup.
Tested: ummon
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Dvirtual.c | 8 | ||||
| -rw-r--r-- | src/H5Shyper.c | 5 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/H5Dvirtual.c b/src/H5Dvirtual.c index 6415afd..9bc154c 100644 --- a/src/H5Dvirtual.c +++ b/src/H5Dvirtual.c @@ -235,8 +235,8 @@ H5D_virtual_update_min_dims(H5O_layout_t *layout, size_t idx) for(i = 0; i < rank; i++) /* Don't check unlimited dimensions in the selection */ if((i != layout->storage.u.virt.list[idx].unlim_dim_virtual) - && (bounds_end[i] > layout->storage.u.virt.min_dims[i])) - layout->storage.u.virt.min_dims[i] = bounds_end[i]; + && (bounds_end[i] >= layout->storage.u.virt.min_dims[i])) + layout->storage.u.virt.min_dims[i] = bounds_end[i] + (hsize_t)1; done: FUNC_LEAVE_NOAPI(ret_value) @@ -422,8 +422,8 @@ H5D__virtual_set_extent_unlim(const H5D_t *dset, hid_t dxpl_id) for(i = 0; i < (size_t)rank; i++) { if(new_dims[i] == HSIZE_UNDEF) new_dims[i] = curr_dims[i]; - if(new_dims[i] < storage->min_dims[i]) { - HDassert(0 && "Checking code coverage..."); //VDSINC + else if(new_dims[i] < storage->min_dims[i]) { + //HDassert(0 && "Checking code coverage..."); //VDSINC new_dims[i] = storage->min_dims[i]; } //VDSINC if(new_dims[i] != curr_dims[i]) diff --git a/src/H5Shyper.c b/src/H5Shyper.c index 468f87e..4e82aed 100644 --- a/src/H5Shyper.c +++ b/src/H5Shyper.c @@ -9956,9 +9956,7 @@ H5S_hyper_get_clip_extent(const H5S_t *clip_space, const H5S_t *match_space, rem_slices = num_slices - (count * clip_hslab->opt_unlim_diminfo[clip_hslab->unlim_dim].block); - if(rem_slices > 0) { - HDassert(incl_trail && "Checking code coverage..."); //VDSINC - HDassert(!incl_trail && "Checking code coverage..."); //VDSINC + if(rem_slices > 0) /* Must end extent in middle of partial block (or beginning of empty * block if include_trailing_space and rem_slices == 0) */ *clip_size = @@ -9966,7 +9964,6 @@ H5S_hyper_get_clip_extent(const H5S_t *clip_space, const H5S_t *match_space, + (count * clip_hslab->opt_unlim_diminfo[clip_hslab->unlim_dim].stride) + rem_slices; - } /* end if */ else { if(incl_trail) /* End extent just before first missing block */ |