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/fortran/src/H5IMcc.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/fortran/src/H5IMcc.h')
-rw-r--r-- | hl/fortran/src/H5IMcc.h | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/hl/fortran/src/H5IMcc.h b/hl/fortran/src/H5IMcc.h new file mode 100644 index 0000000..32c79ff --- /dev/null +++ b/hl/fortran/src/H5IMcc.h @@ -0,0 +1,66 @@ + +/**************************************************************************** + * NCSA HDF * + * Scientific Data Technologies * + * National Center for Supercomputing Applications * + * University of Illinois at Urbana-Champaign * + * 605 E. Springfield, Champaign IL 61820 * + * * + * For conditions of distribution and use, see the accompanying * + * hdf/COPYING file. * + * * + ****************************************************************************/ + + +#ifndef _H5IMCC_H +#define _H5IMCC_H + +#include "H5LT.h" +#include "H5IM.h" +#include "../../fortran/src/H5f90i_gen.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#define IMAGE_CLASS "IMAGE" +#define PALETTE_CLASS "PALETTE" +#define IMAGE_VERSION "1.2" +#define IMAGE8_RANK 3 +#define IMAGE24_RANK 3 + + + +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 ); + + +#ifdef __cplusplus +} +#endif + +#endif |