diff options
| author | Elena Pourmal <epourmal@hdfgroup.org> | 2004-07-03 02:39:24 (GMT) |
|---|---|---|
| committer | Elena Pourmal <epourmal@hdfgroup.org> | 2004-07-03 02:39:24 (GMT) |
| commit | 3a6668b2f948d266bf7c99d641c331ff09021ceb (patch) | |
| tree | 3f65c3449d328d82b37fbe458bcb033d5ac3c26f | |
| parent | 0f7e7766509bdf92eda32e08f50dc8197a231710 (diff) | |
| download | hdf5-3a6668b2f948d266bf7c99d641c331ff09021ceb.zip hdf5-3a6668b2f948d266bf7c99d641c331ff09021ceb.tar.gz hdf5-3a6668b2f948d266bf7c99d641c331ff09021ceb.tar.bz2 | |
[svn-r8799]
Purpose: Maintenance
Description: H5_SZIP_CHIP_OPTION_MASK was deleted from the list
of the available parameters for the H5Pset_szip function.
Solution: Updated Fortran source, tests and documentation
to reflect this change.
Platforms tested: arabica (too small for h5committest)
Misc. update:
| -rw-r--r-- | doc/html/RM_H5P.html | 7 | ||||
| -rw-r--r-- | fortran/src/H5_f.c | 10 | ||||
| -rw-r--r-- | fortran/src/H5f90global.f90 | 10 | ||||
| -rw-r--r-- | fortran/test/tH5Z.f90 | 2 |
4 files changed, 7 insertions, 22 deletions
diff --git a/doc/html/RM_H5P.html b/doc/html/RM_H5P.html index 9897793..a872178 100644 --- a/doc/html/RM_H5P.html +++ b/doc/html/RM_H5P.html @@ -9162,15 +9162,8 @@ SUBROUTINE h5pset_szip_f(prp_id, hdferr) ! A bit-mask conveying the desired ! SZIP options ! Current valid values in Fortran are: - ! H5_SZIP_AK13_OM_F - ! H5_SZIP_CHIP_OM_F ! H5_SZIP_EC_OM_F ! H5_SZIP_NN_OM_F - ! Or the sum of any combination - ! of the above, e.g., - ! (H5_SZIP_AK13_OM_F + H5_SZIP_NN_OM_F) - ! Check C reference manual regarding - ! mutually-exclusive options INTEGER, INTENT(IN) :: pixels_per_block ! The number of pixels or data elements ! in each data block diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c index d740d29..4e0ecbc 100644 --- a/fortran/src/H5_f.c +++ b/fortran/src/H5_f.c @@ -381,14 +381,10 @@ int_f nh5init1_flags_c(int_f *h5lib_flags) { int ret_value = -1; - unsigned prm_1 = H5_SZIP_ALLOW_K13_OPTION_MASK; - unsigned prm_2 = H5_SZIP_CHIP_OPTION_MASK; - unsigned prm_3 = H5_SZIP_EC_OPTION_MASK; - unsigned prm_4 = H5_SZIP_NN_OPTION_MASK; + unsigned prm_1 = H5_SZIP_EC_OPTION_MASK; + unsigned prm_2 = H5_SZIP_NN_OPTION_MASK; h5lib_flags[0] = (int_f)prm_1; - h5lib_flags[1] = (int_f)prm_2; - h5lib_flags[2] = (int_f)prm_3; - h5lib_flags[3] = (int_f)prm_4; + h5lib_flags[1] = (int_f)prm_2; ret_value = 0; return ret_value; } diff --git a/fortran/src/H5f90global.f90 b/fortran/src/H5f90global.f90 index 7eb5732..2e54c4a 100644 --- a/fortran/src/H5f90global.f90 +++ b/fortran/src/H5f90global.f90 @@ -555,21 +555,17 @@ ! ! H5 Library flags declaration ! - INTEGER, PARAMETER :: H5LIB_FLAGS_LEN = 4 + INTEGER, PARAMETER :: H5LIB_FLAGS_LEN = 2 INTEGER :: H5LIB_flags(H5LIB_FLAGS_LEN) !DEC$if defined(BUILD_HDF5_DLL) !DEC$ ATTRIBUTES DLLEXPORT :: /H5LIB_FLAGS/ !DEC$endif COMMON /H5LIB_FLAGS/ H5LIB_flags - INTEGER :: H5_SZIP_AK13_OM_F - INTEGER :: H5_SZIP_CHIP_OM_F INTEGER :: H5_SZIP_EC_OM_F INTEGER :: H5_SZIP_NN_OM_F ! - EQUIVALENCE(H5LIB_flags(1), H5_SZIP_AK13_OM_F) - EQUIVALENCE(H5LIB_flags(2), H5_SZIP_CHIP_OM_F) - EQUIVALENCE(H5LIB_flags(3), H5_SZIP_EC_OM_F) - EQUIVALENCE(H5LIB_flags(4), H5_SZIP_NN_OM_F) + EQUIVALENCE(H5LIB_flags(1), H5_SZIP_EC_OM_F) + EQUIVALENCE(H5LIB_flags(2), H5_SZIP_NN_OM_F) END MODULE H5GLOBAL diff --git a/fortran/test/tH5Z.f90 b/fortran/test/tH5Z.f90 index cb50909..4260fca 100644 --- a/fortran/test/tH5Z.f90 +++ b/fortran/test/tH5Z.f90 @@ -212,7 +212,7 @@ return endif - options_mask = H5_SZIP_NN_OM_F + H5_SZIP_CHIP_OM_F + options_mask = H5_SZIP_NN_OM_F pix_per_block = 32 ! ! Initialize the dset_data array. |