diff options
| author | M. Scot Breitenfeld <brtnfld@hdfgroup.org> | 2019-02-08 18:00:14 (GMT) |
|---|---|---|
| committer | M. Scot Breitenfeld <brtnfld@hdfgroup.org> | 2019-02-08 18:00:14 (GMT) |
| commit | c752332bfd0e9c3090f3a0c02d0253cd45c2e2ce (patch) | |
| tree | 9602624e089f7e560e32a40bf98773054c1573b9 /src/H5Sselect.c | |
| parent | 602bdd1c6ae61f845d135a5c98a90de11e8b06a7 (diff) | |
| parent | 4300ca623482508d19caf427fdadce86f811e347 (diff) | |
| download | hdf5-c752332bfd0e9c3090f3a0c02d0253cd45c2e2ce.zip hdf5-c752332bfd0e9c3090f3a0c02d0253cd45c2e2ce.tar.gz hdf5-c752332bfd0e9c3090f3a0c02d0253cd45c2e2ce.tar.bz2 | |
Merge branch 'develop' into parallel_vds_develop
Diffstat (limited to 'src/H5Sselect.c')
| -rw-r--r-- | src/H5Sselect.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/H5Sselect.c b/src/H5Sselect.c index a42d12e..6e6ca76 100644 --- a/src/H5Sselect.c +++ b/src/H5Sselect.c @@ -1515,14 +1515,20 @@ H5S_select_iterate(void *buf, const H5T_t *type, const H5S_t *space, /* Make the application callback */ user_ret = (op->u.app_op.op)(loc, op->u.app_op.type_id, ndims, coords, op_data); break; + case H5S_SEL_ITER_OP_LIB: /* Call the library's callback */ user_ret = (op->u.lib_op)(loc, type, ndims, coords, op_data); break; + default: HGOTO_ERROR(H5E_DATASPACE, H5E_UNSUPPORTED, FAIL, "unsupported op type") } /* end switch */ + /* Check for error return from iterator */ + if(user_ret < 0) + HERROR(H5E_DATASPACE, H5E_CANTNEXT, "iteration operator failed"); + /* Increment offset in dataspace */ curr_off += elmt_size; @@ -1711,10 +1717,6 @@ H5S_select_shape_same(const H5S_t *space1, const H5S_t *space2) HDassert(space_a_rank >= space_b_rank); HDassert(space_b_rank > 0); - /* Check for different number of elements selected */ - if(H5S_GET_SELECT_NPOINTS(space_a) != H5S_GET_SELECT_NPOINTS(space_b)) - HGOTO_DONE(FALSE) - /* Check for "easy" cases before getting into generalized block iteration code */ if((H5S_GET_SELECT_TYPE(space_a) == H5S_SEL_ALL) && (H5S_GET_SELECT_TYPE(space_b) == H5S_SEL_ALL)) { hsize_t dims1[H5O_LAYOUT_NDIMS]; /* End point of selection block in dataspace #1 */ |