diff options
author | Neil Fortner <nfortne2@hdfgroup.org> | 2019-11-26 17:38:25 (GMT) |
---|---|---|
committer | Neil Fortner <nfortne2@hdfgroup.org> | 2019-11-26 17:38:25 (GMT) |
commit | 9f61c26927ac74c4498cbebd7c9f2166d5f5b786 (patch) | |
tree | 81df83e8c53a80b61365d579b26aeb9532fe493f /src/H5Spublic.h | |
parent | 5f3414e4d908fcdc8f3d31c624c4c157d87161e8 (diff) | |
parent | 4e12984b77cdd7615843d94f8de8d54db27476ac (diff) | |
download | hdf5-9f61c26927ac74c4498cbebd7c9f2166d5f5b786.zip hdf5-9f61c26927ac74c4498cbebd7c9f2166d5f5b786.tar.gz hdf5-9f61c26927ac74c4498cbebd7c9f2166d5f5b786.tar.bz2 |
Merge pull request #2045 in HDFFV/hdf5 from ~NFORTNE2/hdf5_naf:select_adjust to develop
* commit '4e12984b77cdd7615843d94f8de8d54db27476ac':
Move checking for zero offset in selection adjust calls to the selection callbacks. This makes the procedure for checking it consistent across selection types and between _s and _u, ensures it is always is performed even when called within the H5S package, and removes the redundant check that would occur when callins H5S_select_adjust_s() from outside the H5S package.
Replace H5Sselect_adjust_u() and H5Shyper_adjust_s() with H5Sselect_adjust. Implement "adjust_s" callback for all selection types. Add range checking to H5Sselect_adjust().
Diffstat (limited to 'src/H5Spublic.h')
-rw-r--r-- | src/H5Spublic.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/H5Spublic.h b/src/H5Spublic.h index 263a880..f7c5ae7 100644 --- a/src/H5Spublic.h +++ b/src/H5Spublic.h @@ -143,7 +143,7 @@ H5_DLL H5S_sel_type H5Sget_select_type(hid_t spaceid); H5_DLL hssize_t H5Sget_select_npoints(hid_t spaceid); H5_DLL herr_t H5Sselect_copy(hid_t dst_id, hid_t src_id); H5_DLL htri_t H5Sselect_valid(hid_t spaceid); -H5_DLL herr_t H5Sselect_adjust_u(hid_t spaceid, const hsize_t *offset); +H5_DLL herr_t H5Sselect_adjust(hid_t spaceid, const hssize_t *offset); H5_DLL herr_t H5Sget_select_bounds(hid_t spaceid, hsize_t start[], hsize_t end[]); H5_DLL htri_t H5Sselect_shape_same(hid_t space1_id, hid_t space2_id); @@ -171,7 +171,6 @@ H5_DLL htri_t H5Sget_regular_hyperslab(hid_t spaceid, hsize_t start[], H5_DLL hssize_t H5Sget_select_hyper_nblocks(hid_t spaceid); H5_DLL herr_t H5Sget_select_hyper_blocklist(hid_t spaceid, hsize_t startblock, hsize_t numblocks, hsize_t buf[/*numblocks*/]); -H5_DLL herr_t H5Shyper_adjust_s(hid_t space_id, const hssize_t *offset); H5_DLL hid_t H5Sselect_project_intersection(hid_t src_space_id, hid_t dst_space_id, hid_t src_intersect_space_id); |