diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2001-08-10 22:30:01 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2001-08-10 22:30:01 (GMT) |
| commit | d24ae52673e96864f4e406dd7b277f91d42fbb38 (patch) | |
| tree | e9bb3c48c58f43899616fe8d6cda8daec8d4cc8a /tools/gifconv/readhdf.c | |
| parent | 48842d60fa84fb69fb0a3dc527132eb93a6be7f2 (diff) | |
| download | hdf5-d24ae52673e96864f4e406dd7b277f91d42fbb38.zip hdf5-d24ae52673e96864f4e406dd7b277f91d42fbb38.tar.gz hdf5-d24ae52673e96864f4e406dd7b277f91d42fbb38.tar.bz2 | |
[svn-r4326] Purpose:
Code cleanups, mostly..
Description:
Work on pacifying the SGI compiler to get the generic properties working
correctly with --enable-parallel and --enable-fortran. It's not quite
fixed yet, but I need to head home and these patches help... :-/
Platforms tested:
IRIX64 6.5 (modi4)
Diffstat (limited to 'tools/gifconv/readhdf.c')
| -rw-r--r-- | tools/gifconv/readhdf.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tools/gifconv/readhdf.c b/tools/gifconv/readhdf.c index 912c2c6..08258de 100644 --- a/tools/gifconv/readhdf.c +++ b/tools/gifconv/readhdf.c @@ -34,7 +34,6 @@ int ReadHDF(BYTE** data, BYTE palette[256][3], hsize_t *image_size, CHAR *h5_file, CHAR *dset_name, CHAR *pal_name) { hid_t fHfile; /* H5 file to open */ - herr_t status; /* status variable */ hid_t dspace; /* dataspace identifier for the the dataset */ hid_t dset; /* dataset identifier */ hid_t pal_set; /* dataset for palette */ @@ -88,7 +87,7 @@ int ReadHDF(BYTE** data, BYTE palette[256][3], hsize_t *image_size, } /* get the actual image */ - if ((status = H5Dread(dset , H5Dget_type(dset) , H5S_ALL , H5S_ALL , H5P_DEFAULT , *data)) < 0) { + if (H5Dread(dset , H5Dget_type(dset) , H5S_ALL , H5S_ALL , H5P_DEFAULT , *data) < 0) { fprintf(stderr , "Unable to read data \n"); cleanup(*data); return -1; @@ -139,7 +138,7 @@ int ReadHDF(BYTE** data, BYTE palette[256][3], hsize_t *image_size, } /* get the actual palette */ - if ((status = H5Dread(pal_set , H5Dget_type(pal_set) , H5S_ALL , H5S_ALL , H5P_DEFAULT , temp_buf)) < 0) { + if (H5Dread(pal_set , H5Dget_type(pal_set) , H5S_ALL , H5S_ALL , H5P_DEFAULT , temp_buf) < 0) { fprintf(stderr , "Unable to read data \n"); cleanup(*data); cleanup(temp_buf); @@ -166,8 +165,8 @@ int ReadHDF(BYTE** data, BYTE palette[256][3], hsize_t *image_size, } /* close everything */ - status = H5Dclose(dset); - status = H5Sclose(dspace); - status = H5Fclose(fHfile); + H5Dclose(dset); + H5Sclose(dspace); + H5Fclose(fHfile); return 0; } |