diff options
| author | Elena Pourmal <epourmal@hdfgroup.org> | 2005-06-24 05:00:01 (GMT) |
|---|---|---|
| committer | Elena Pourmal <epourmal@hdfgroup.org> | 2005-06-24 05:00:01 (GMT) |
| commit | 2ab6b12b552e9260e2e76640a788b5a3744c6a9f (patch) | |
| tree | 6ef872a02a4fd46af33370854af5e7876f4fa29b /hl/src/H5IM.h | |
| parent | e38365206ae36d83b8e573eb0b2e51e555699c97 (diff) | |
| download | hdf5-2ab6b12b552e9260e2e76640a788b5a3744c6a9f.zip hdf5-2ab6b12b552e9260e2e76640a788b5a3744c6a9f.tar.gz hdf5-2ab6b12b552e9260e2e76640a788b5a3744c6a9f.tar.bz2 | |
[svn-r10977] Purpose: Bug fix
Description:
1.7 daily tests failed in HL library when Fortran was not
enabled; also long long instead of long_long declarations
were used and caused failures on Windows
Solution:
Removed Fortran related functions (except H5IM_find_palette) from
H5IM.c file and put it into fortran/src/H5IMcc.c
Modified appropriate Makefile.am files, regenerated Makefile.in files, updated header files, MANIFEST, etc.
Note: H5IM_find_palette should be also in H5IMcc.c, but
for some unknown to me reason, linking fails if the function is
included in H5IMcc.c. I will really appreciate if some C guru
will look into the code and figure out what is wrong :-) Thanks!
Platforms tested: mir with g95, heping with and without Fortran enabled
Misc. update:
Diffstat (limited to 'hl/src/H5IM.h')
| -rw-r--r-- | hl/src/H5IM.h | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/hl/src/H5IM.h b/hl/src/H5IM.h index 27359dd..aaec421 100644 --- a/hl/src/H5IM.h +++ b/hl/src/H5IM.h @@ -16,7 +16,6 @@ #define _H5IM_H #include "H5LT.h" -#include "../../fortran/src/H5f90i_gen.h" #ifdef __cplusplus extern "C" { @@ -90,32 +89,8 @@ herr_t H5IMis_image( hid_t loc_id, herr_t H5IMis_palette( hid_t loc_id, const char *dset_name ); -herr_t H5IMmake_image_8bitf( hid_t loc_id, - const char *dset_name, - hsize_t width, - hsize_t height, - int_f *buf ); - -herr_t H5IMmake_image_24bitf( hid_t loc_id, - const char *dset_name, - hsize_t width, - hsize_t height, - const char *interlace, - int_f *buf); - -herr_t H5IMread_imagef( hid_t loc_id, - const char *dset_name, - int_f *buf ); - -herr_t H5IMmake_palettef( hid_t loc_id, - const char *pal_name, - const hsize_t *pal_dims, - int_f *pal_data ); - -herr_t H5IMget_palettef( hid_t loc_id, - const char *image_name, - int pal_number, - int_f *pal_data ); +herr_t H5IM_find_palette( hid_t loc_id ); + #ifdef __cplusplus |