diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2005-05-16 19:08:41 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2005-05-16 19:08:41 (GMT) |
| commit | 5b6c08e68e94cab82653dff0c74d1725fd2852f4 (patch) | |
| tree | d08b050aff5fcaa5f51897769e41a023709a7177 /hl/fortran/src/H5IMfc.c | |
| parent | 4977e0ac5163ce29211596f84cb39c3c5e525a16 (diff) | |
| download | hdf5-5b6c08e68e94cab82653dff0c74d1725fd2852f4.zip hdf5-5b6c08e68e94cab82653dff0c74d1725fd2852f4.tar.gz hdf5-5b6c08e68e94cab82653dff0c74d1725fd2852f4.tar.bz2 | |
[svn-r10747] Purpose:
bug fix
Description:
the fortran type integer*1 has become not portable.
define the image fortran datatype as "integer" and make special save, read, and palette functions
that use native integer for a memory type and UCHAR as disk type for the image data
added some more tests with new palette definitions
Solution:
Platforms tested:
linux
solaris
Misc. update:
Diffstat (limited to 'hl/fortran/src/H5IMfc.c')
| -rwxr-xr-x | hl/fortran/src/H5IMfc.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/hl/fortran/src/H5IMfc.c b/hl/fortran/src/H5IMfc.c index fed4111..f4c71cb 100755 --- a/hl/fortran/src/H5IMfc.c +++ b/hl/fortran/src/H5IMfc.c @@ -16,7 +16,6 @@ #include "H5IM.h" #include "H5LTf90proto.h" -#include <stdlib.h> /*------------------------------------------------------------------------- @@ -44,7 +43,7 @@ nh5immake_image_8bit_c (hid_t_f *loc_id, _fcd name, hsize_t_f *width, hsize_t_f *height, - unsigned char *buf) + void *buf) { int ret_value = -1; herr_t ret; @@ -60,11 +59,11 @@ nh5immake_image_8bit_c (hid_t_f *loc_id, if (c_name == NULL) return ret_value; /* - * Call H5IMmake_image_8bit function. + * Call H5IMmake_image_8bitf function. */ c_loc_id = (hid_t)*loc_id; - ret = H5IMmake_image_8bit(c_loc_id,c_name,*width,*height,buf); + ret = H5IMmake_image_8bitf(c_loc_id,c_name,*width,*height,buf); if (ret < 0) return ret_value; ret_value = 0; @@ -94,7 +93,7 @@ int_f nh5imread_image_c (hid_t_f *loc_id, int_f *namelen, _fcd name, - unsigned char *buf) + void *buf) { int ret_value = -1; herr_t ret; @@ -115,7 +114,7 @@ nh5imread_image_c (hid_t_f *loc_id, */ c_loc_id = (hid_t)*loc_id; - ret = H5IMread_image(c_loc_id,c_name,buf); + ret = H5IMread_imagef(c_loc_id,c_name,buf); if (ret < 0) return ret_value; ret_value = 0; @@ -149,7 +148,7 @@ nh5immake_image_24bit_c (hid_t_f *loc_id, _fcd il, hsize_t_f *width, hsize_t_f *height, - unsigned char *buf) + void *buf) { int ret_value = -1; herr_t ret; @@ -171,11 +170,11 @@ nh5immake_image_24bit_c (hid_t_f *loc_id, if (c_il == NULL) return ret_value; /* - * Call H5IMmake_image_24bit function. + * Call H5IMmake_image_24bitf function. */ c_loc_id = (hid_t)*loc_id; - ret = H5IMmake_image_24bit(c_loc_id,c_name,*width,*height,c_il,buf); + ret = H5IMmake_image_24bitf(c_loc_id,c_name,*width,*height,c_il,buf); if (ret < 0) return ret_value; ret_value = 0; @@ -331,7 +330,7 @@ nh5immake_palette_c (hid_t_f *loc_id, int_f *namelen, _fcd name, hsize_t_f *dims, - unsigned char *buf) + void *buf) { int ret_value = -1; herr_t ret; @@ -361,7 +360,7 @@ nh5immake_palette_c (hid_t_f *loc_id, */ c_loc_id = (hid_t)*loc_id; - ret = H5IMmake_palette(c_loc_id,c_name,c_dims,buf); + ret = H5IMmake_palettef(c_loc_id,c_name,c_dims,buf); free (c_dims); @@ -632,7 +631,7 @@ nh5imget_palette_c(hid_t_f *loc_id, int_f *namelen, _fcd name, int_f *pal_number, - unsigned char *buf) + void *buf) { int ret_value = -1; herr_t ret; @@ -652,7 +651,7 @@ nh5imget_palette_c(hid_t_f *loc_id, */ c_loc_id = (hid_t)*loc_id; - ret = H5IMget_palette(c_loc_id,c_name,*pal_number,buf); + ret = H5IMget_palettef(c_loc_id,c_name,*pal_number,buf); if (ret < 0) return ret_value; ret_value = 0; |