diff options
| -rw-r--r-- | fortran/src/H5Pf.c | 6 | ||||
| -rw-r--r-- | fortran/src/H5Pff.f90 | 9 | ||||
| -rw-r--r-- | fortran/src/H5f90proto.h | 2 | ||||
| -rw-r--r-- | fortran/test/tH5Z.f90 | 3 |
4 files changed, 7 insertions, 13 deletions
diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c index 57f2f7d..01e4af1 100644 --- a/fortran/src/H5Pf.c +++ b/fortran/src/H5Pf.c @@ -2819,16 +2819,14 @@ DONE: *---------------------------------------------------------------------------*/ int_f -nh5pset_shuffle_c ( hid_t_f *prp_id , int_f *type_size) +nh5pset_shuffle_c ( hid_t_f *prp_id ) { int ret_value = 0; hid_t c_prp_id; - int c_type_size; herr_t status; c_prp_id = (hid_t)*prp_id; - c_type_size = (int)*type_size ; - status = H5Pset_shuffle(c_prp_id, c_type_size); + status = H5Pset_shuffle(c_prp_id); if ( status < 0 ) ret_value = -1; return ret_value; } diff --git a/fortran/src/H5Pff.f90 b/fortran/src/H5Pff.f90 index 23d59f0..e6f4593 100644 --- a/fortran/src/H5Pff.f90 +++ b/fortran/src/H5Pff.f90 @@ -5691,7 +5691,6 @@ ! ! Inputs: ! prp_id - dataset creation property list identifier -! type_size - size of the datatype ! Outputs: ! hdferr: - error code ! Success: 0 @@ -5708,7 +5707,7 @@ !---------------------------------------------------------------------- - SUBROUTINE h5pset_shuffle_f(prp_id, type_size, hdferr) + SUBROUTINE h5pset_shuffle_f(prp_id, hdferr) ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -5717,23 +5716,21 @@ ! IMPLICIT NONE INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier - INTEGER, INTENT(IN) :: type_size ! iSize in bytes of the datatype INTEGER, INTENT(OUT) :: hdferr ! Error code ! INTEGER, EXTERNAL :: h5pset_shuffle_c ! MS FORTRAN needs explicit interface for C functions called here. ! INTERFACE - INTEGER FUNCTION h5pset_shuffle_c(prp_id, type_size) + INTEGER FUNCTION h5pset_shuffle_c(prp_id) USE H5GLOBAL !DEC$ IF DEFINED(HDF5F90_WINDOWS) !MS$ATTRIBUTES C,reference,alias:'_H5PSET_SHUFFLE_C'::h5pset_shuffle_c !DEC$ ENDIF INTEGER(HID_T), INTENT(IN) :: prp_id - INTEGER, INTENT(IN) :: type_size END FUNCTION h5pset_shuffle_c END INTERFACE - hdferr = h5pset_shuffle_c(prp_id, type_size) + hdferr = h5pset_shuffle_c(prp_id) END SUBROUTINE h5pset_shuffle_f diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h index 095768f..4d53ba5 100644 --- a/fortran/src/H5f90proto.h +++ b/fortran/src/H5f90proto.h @@ -1054,7 +1054,7 @@ H5_DLL int_f nh5premove_c(hid_t_f *plid, _fcd name, int_f *name_len); H5_DLL int_f nh5punregister_c(hid_t_f *class, _fcd name, int_f *name_len); H5_DLL int_f nh5pclose_class_c(hid_t_f * class); H5_DLL int_f nh5pget_class_name_c(hid_t_f *prp_id, _fcd name, int_f *name_len); -H5_DLL int_f nh5pset_shuffle_c ( hid_t_f *prp_id , int_f *type_size); +H5_DLL int_f nh5pset_shuffle_c ( hid_t_f *prp_id); H5_DLL int_f nh5pset_fletcher32_c ( hid_t_f *prp_id ); H5_DLL int_f nh5pset_edc_check_c ( hid_t_f *prp_id, int_f *flag ); H5_DLL int_f nh5pget_edc_check_c ( hid_t_f *prp_id, int_f *flag ); diff --git a/fortran/test/tH5Z.f90 b/fortran/test/tH5Z.f90 index 921bbd1..f062c0b 100644 --- a/fortran/test/tH5Z.f90 +++ b/fortran/test/tH5Z.f90 @@ -14,7 +14,6 @@ INTEGER(HSIZE_T) :: ch_dims(2) INTEGER :: RANK = 2 INTEGER :: dlevel = 6 - INTEGER :: tsize = 4 INTEGER :: edc_flag ch_dims(1) = 10 @@ -45,7 +44,7 @@ CALL check("h5pcreate_f", error, total_error) CALL h5pset_chunk_f(crtpr_id, RANK, ch_dims, error) CALL check("h5pset_chunk_f",error, total_error) - CALL h5pset_shuffle_f(crtpr_id, tsize, error) + CALL h5pset_shuffle_f(crtpr_id, error) CALL check("h5pset_shuffle_f", error, total_error) CALL h5pclose_f(crtpr_id,error) CALL check("h5pclose_f", error, total_error) |