diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2003-06-04 15:22:23 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2003-06-04 15:22:23 (GMT) |
commit | bb042d83c73df85f30c7103e9ff93b5cc630fced (patch) | |
tree | 5638b25ee89850f8066baadb25d24a7f5e688f6c /fortran | |
parent | 112aff61caec385132f05fc50efe8d3ce3357929 (diff) | |
download | hdf5-bb042d83c73df85f30c7103e9ff93b5cc630fced.zip hdf5-bb042d83c73df85f30c7103e9ff93b5cc630fced.tar.gz hdf5-bb042d83c73df85f30c7103e9ff93b5cc630fced.tar.bz2 |
[svn-r6950] Purpose:
API tweak.
Description:
The H5Sget_select_bounds() API call was using hsize_t arrays for retrieving
the 'start' and 'end' coordinates, which is counter to the rest of the dataspace
API.
Solution:
Change the arrays to be hssize_t instead.
Platforms tested:
FreeBSD 4.8 (sleipnir) w/C++
FreeBSD 4.8 (sleipnir) w/parallel
h5committested
Misc. update:
Updated all docs for this change.
Added 1.4 compatibility #ifdef's
Diffstat (limited to 'fortran')
-rw-r--r-- | fortran/src/H5Sf.c | 12 | ||||
-rw-r--r-- | fortran/src/H5Sff.f90 | 8 | ||||
-rw-r--r-- | fortran/src/H5f90proto.h | 2 | ||||
-rw-r--r-- | fortran/test/tH5Sselect.f90 | 4 |
4 files changed, 13 insertions, 13 deletions
diff --git a/fortran/src/H5Sf.c b/fortran/src/H5Sf.c index a6a793e..c9cc66b 100644 --- a/fortran/src/H5Sf.c +++ b/fortran/src/H5Sf.c @@ -246,28 +246,28 @@ nh5sget_select_hyper_blocklist_c( hid_t_f *space_id ,hsize_t_f * startblock, *---------------------------------------------------------------------------*/ int_f -nh5sget_select_bounds_c( hid_t_f *space_id , hsize_t_f * start, hsize_t_f * end) +nh5sget_select_bounds_c( hid_t_f *space_id , hssize_t_f * start, hssize_t_f * end) { int ret_value = -1; hid_t c_space_id; - hsize_t* c_start, *c_end; + hssize_t* c_start, *c_end; int i, rank; c_space_id = *space_id; rank = H5Sget_simple_extent_ndims(c_space_id); if (rank < 0 ) return ret_value; - c_start =(hsize_t*) malloc(sizeof(hsize_t)*rank); + c_start =(hssize_t*) malloc(sizeof(hssize_t)*rank); if (!c_start) return ret_value; - c_end = (hsize_t*)malloc(sizeof(hsize_t)*rank); + c_end = (hssize_t*)malloc(sizeof(hssize_t)*rank); if(!c_end) return ret_value; ret_value = H5Sget_select_bounds(c_space_id, c_start, c_end); for(i = 0; i < rank; i++) { - start[i] = (hsize_t_f)(c_start[i]+1); - end[i] = (hsize_t_f)(c_end[i]+1); + start[i] = (hssize_t_f)(c_start[i]+1); + end[i] = (hssize_t_f)(c_end[i]+1); } if (ret_value >= 0 ) ret_value = 0; diff --git a/fortran/src/H5Sff.f90 b/fortran/src/H5Sff.f90 index a938947..9f854f5 100644 --- a/fortran/src/H5Sff.f90 +++ b/fortran/src/H5Sff.f90 @@ -436,9 +436,9 @@ IMPLICIT NONE INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier - INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: start + INTEGER(HSSIZE_T), DIMENSION(*), INTENT(OUT) :: start !Starting coordinates of the bounding box. - INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: end + INTEGER(HSSIZE_T), DIMENSION(*), INTENT(OUT) :: end !Ending coordinates of the bounding box, !i.e., the coordinates of the diagonally !opposite corner @@ -454,8 +454,8 @@ !MS$ATTRIBUTES C,reference,alias:'_H5SGET_SELECT_BOUNDS_C'::h5sget_select_bounds_c !DEC$ ENDIF INTEGER(HID_T), INTENT(IN) :: space_id - INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: start - INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: end + INTEGER(HSSIZE_T), DIMENSION(*), INTENT(OUT) :: start + INTEGER(HSSIZE_T), DIMENSION(*), INTENT(OUT) :: end END FUNCTION h5sget_select_bounds_c END INTERFACE diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h index 2272bce..eb36088 100644 --- a/fortran/src/H5f90proto.h +++ b/fortran/src/H5f90proto.h @@ -159,7 +159,7 @@ H5_DLL int_f nh5scopy_c ( hid_t_f *space_id , hid_t_f *new_space_id); H5_DLL int_f nh5sget_select_hyper_nblocks_c( hid_t_f *space_id , hssize_t_f * num_blocks); H5_DLL int_f nh5sget_select_hyper_blocklist_c( hid_t_f *space_id ,hsize_t_f * startblock, hsize_t_f * num_blocks, hsize_t_f * buf); -H5_DLL int_f nh5sget_select_bounds_c( hid_t_f *space_id , hsize_t_f * start, hsize_t_f * end); +H5_DLL int_f nh5sget_select_bounds_c( hid_t_f *space_id , hssize_t_f * start, hssize_t_f * end); H5_DLL int_f nh5sget_select_elem_npoints_c( hid_t_f *space_id , hssize_t_f * num_points); diff --git a/fortran/test/tH5Sselect.f90 b/fortran/test/tH5Sselect.f90 index 8b2e281..0e3ed9e 100644 --- a/fortran/test/tH5Sselect.f90 +++ b/fortran/test/tH5Sselect.f90 @@ -792,9 +792,9 @@ INTEGER(HSIZE_T), ALLOCATABLE, DIMENSION(:) :: pointlist ! - !start and end bounds in the current dataspac selection + !start and end bounds in the current dataspace selection ! - INTEGER(HSIZE_T), DIMENSION(RANK) :: startout, endout + INTEGER(HSSIZE_T), DIMENSION(RANK) :: startout, endout ! !data to write |