summaryrefslogtreecommitdiffstats
path: root/hl/src/H5IM.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2004-12-29 14:26:20 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2004-12-29 14:26:20 (GMT)
commit427ff7da2848042f68ecfadf5a321b1d8077e9db (patch)
tree73024b1954031fbb724c2d96a485590348e5cc22 /hl/src/H5IM.c
parent9b96fd2003ae74cca389cc4c2216b4371d6eb173 (diff)
downloadhdf5-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/src/H5IM.c')
-rw-r--r--hl/src/H5IM.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/hl/src/H5IM.c b/hl/src/H5IM.c
index a2b8172..4d5ce75 100644
--- a/hl/src/H5IM.c
+++ b/hl/src/H5IM.c
@@ -535,10 +535,7 @@ herr_t H5IMlink_palette( hid_t loc_id,
hobj_ref_t *refbuf; /* buffer to read references */
hssize_t n_refs;
hsize_t dim_ref;
- int ok_pal, has_pal;
-
- /* Try to find the palette dataset */
- has_pal = H5LTfind_dataset( loc_id, pal_name );
+ int ok_pal;
/* The image dataset may or not have the attribute "PALETTE"
* First we try to open to see if it is already there; if not, it is created.
@@ -888,7 +885,6 @@ herr_t H5IMget_palette_info( hid_t loc_id,
hsize_t dim_ref;
hobj_ref_t *refbuf; /* buffer to read references */
hid_t pal_id;
- int rank;
hid_t pal_space_id;
hsize_t pal_maxdims[2];
@@ -938,7 +934,7 @@ herr_t H5IMget_palette_info( hid_t loc_id,
if ( (pal_space_id = H5Dget_space( pal_id )) < 0 )
goto out;
- if ( (rank = H5Sget_simple_extent_ndims( pal_space_id )) < 0 )
+ if ( H5Sget_simple_extent_ndims( pal_space_id ) < 0 )
goto out;
if ( H5Sget_simple_extent_dims( pal_space_id, pal_dims, pal_maxdims ) < 0 )
@@ -1114,7 +1110,6 @@ herr_t H5IMis_image( hid_t loc_id,
int has_class;
hid_t attr_type;
hid_t attr_id;
- hid_t attr_class;
char attr_data[20];
herr_t ret;
@@ -1143,7 +1138,7 @@ herr_t H5IMis_image( hid_t loc_id,
if ( (attr_type = H5Aget_type( attr_id )) < 0 )
goto out;
- if ( (attr_class = H5Tget_class( attr_type )) < 0 )
+ if ( H5Tget_class( attr_type ) < 0 )
goto out;
if ( H5Aread( attr_id, attr_type, attr_data ) < 0 )
@@ -1203,7 +1198,6 @@ herr_t H5IMis_palette( hid_t loc_id,
int has_class;
hid_t attr_type;
hid_t attr_id;
- hid_t attr_class;
char attr_data[20];
herr_t ret;
@@ -1232,7 +1226,7 @@ herr_t H5IMis_palette( hid_t loc_id,
if ( (attr_type = H5Aget_type( attr_id )) < 0 )
goto out;
- if ( (attr_class = H5Tget_class( attr_type )) < 0 )
+ if ( H5Tget_class( attr_type ) < 0 )
goto out;
if ( H5Aread( attr_id, attr_type, attr_data ) < 0 )