diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2004-12-29 14:26:20 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2004-12-29 14:26:20 (GMT) |
| commit | 427ff7da2848042f68ecfadf5a321b1d8077e9db (patch) | |
| tree | 73024b1954031fbb724c2d96a485590348e5cc22 /hl/test/test_image.c | |
| parent | 9b96fd2003ae74cca389cc4c2216b4371d6eb173 (diff) | |
| download | hdf5-427ff7da2848042f68ecfadf5a321b1d8077e9db.zip hdf5-427ff7da2848042f68ecfadf5a321b1d8077e9db.tar.gz hdf5-427ff7da2848042f68ecfadf5a321b1d8077e9db.tar.bz2 | |
[svn-r9727] Purpose:
Bug Fix/Code Cleanup/Doc Cleanup/Optimization/Branch Sync :-)
Description:
Generally speaking, this is the "signed->unsigned" change to selections.
However, in the process of merging code back, things got stickier and stickier
until I ended up doing a big "sync the two branches up" operation. So... I
brought back all the "infrastructure" fixes from the development branch to the
release branch (which I think were actually making some improvement in
performance) as well as fixed several bugs which had been fixed in one branch,
but not the other.
I've also tagged the repository before making this checkin with the label
"before_signed_unsigned_changes".
Platforms tested:
FreeBSD 4.10 (sleipnir) w/parallel & fphdf5
FreeBSD 4.10 (sleipnir) w/threadsafe
FreeBSD 4.10 (sleipnir) w/backward compatibility
Solaris 2.7 (arabica) w/"purify options"
Solaris 2.8 (sol) w/FORTRAN & C++
AIX 5.x (copper) w/parallel & FORTRAN
IRIX64 6.5 (modi4) w/FORTRAN
Linux 2.4 (heping) w/FORTRAN & C++
Misc. update:
Diffstat (limited to 'hl/test/test_image.c')
| -rw-r--r-- | hl/test/test_image.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/hl/test/test_image.c b/hl/test/test_image.c index d47cab1..c01dd0d 100644 --- a/hl/test/test_image.c +++ b/hl/test/test_image.c @@ -31,15 +31,12 @@ unsigned char image_out2[ WIDTH*HEIGHT*3 ]; int main( void ) { hid_t file_id; - herr_t status; hsize_t width, height, planes; hsize_t pal_dims[] = {9,3}; hsize_t pal_dims_out[2]; hsize_t i; char interlace[20]; hssize_t npals; - herr_t is_image; - herr_t is_palette; unsigned char pal_data_out[9*3]; /* create a 9 entry grey palette */ @@ -165,10 +162,10 @@ int main( void ) *------------------------------------------------------------------------- */ - if ( (is_image = H5IMis_image( file_id, "Image1" )) < 0 ) + if ( H5IMis_image( file_id, "Image1" ) < 0 ) goto out; - if ( (is_image = H5IMis_image( file_id, "Image2" )) < 0 ) + if ( H5IMis_image( file_id, "Image2" ) < 0 ) goto out; /*------------------------------------------------------------------------- @@ -176,7 +173,7 @@ int main( void ) *------------------------------------------------------------------------- */ - if ( (is_palette = H5IMis_palette( file_id, "Pallete" )) < 0 ) + if ( H5IMis_palette( file_id, "Pallete" ) < 0 ) goto out; /*------------------------------------------------------------------------- @@ -185,7 +182,7 @@ int main( void ) */ /* Close the file. */ - status = H5Fclose( file_id ); + if(H5Fclose( file_id ) < 0) goto out; PASSED(); return 0; |