mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-23 16:20:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r7129] Purpose:

Browse Source 
Bug fix

Description:
    Propogate szip flag changes into FORTRAN source & tests

Platforms tested:
    h5committest
This commit is contained in:
Quincey Koziol 2003-07-01 09:53:37 -05:00
parent 732bb9f065
commit 93622d0b7a
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fortran/src/H5_f.c
View File

@ -405,12 +405,14 @@ int_f
nh5init1_flags_c(int_f *h5lib_flags)
{
int ret_value = -1;
unsigned prm_1 = H5_SZIP_RAW_OPTION_MASK;
unsigned prm_2 = H5_SZIP_NN_OPTION_MASK;
unsigned prm_3 = H5_SZIP_RAW_OPTION_MASK | H5_SZIP_NN_OPTION_MASK;
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;
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;
ret_value = 0;
return ret_value;
}

14
fortran/src/H5f90global.f90
View File

@ -608,19 +608,21 @@
!
! H5 Library flags declaration
!
INTEGER, PARAMETER :: H5LIB_FLAGS_LEN = 3
INTEGER, PARAMETER :: H5LIB_FLAGS_LEN = 4
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_RAW_OM_F
INTEGER :: H5_SZIP_ALLOW_K13_OM_F
INTEGER :: H5_SZIP_CHIP_OM_F
INTEGER :: H5_SZIP_EC_OM_F
INTEGER :: H5_SZIP_NN_OM_F
INTEGER :: H5_SZIP_RAWORNN_OM_F
!
EQUIVALENCE(H5LIB_flags(1), H5_SZIP_RAW_OM_F)
EQUIVALENCE(H5LIB_flags(2), H5_SZIP_NN_OM_F)
EQUIVALENCE(H5LIB_flags(3), H5_SZIP_RAWORNN_OM_F)
EQUIVALENCE(H5LIB_flags(1), H5_SZIP_ALLOW_K13_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)
END MODULE H5GLOBAL

2
fortran/test/tH5Z.f90
View File

@ -139,7 +139,7 @@
INTEGER(SIZE_T) :: filter_name_len = 4
INTEGER, DIMENSION(4) :: cd_values
options_mask = H5_SZIP_RAWORNN_OM_F
options_mask = H5_SZIP_NN_OM_F + H5_SZIP_CHIP_OM_F
pix_per_block = 32
!
! Initialize the dset_data array.