summaryrefslogtreecommitdiffstats
path: root/hl/test/test_image.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2006-10-09 03:51:03 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2006-10-09 03:51:03 (GMT)
commit25d1056dbff92a7662ee73c67596d24906530dbc (patch)
treed98bc79a6ffdcf85f4b1f375523991070505acb7 /hl/test/test_image.c
parent6a18d20b406b2285fbf1d3f6c830b8147635597b (diff)
downloadhdf5-25d1056dbff92a7662ee73c67596d24906530dbc.zip
hdf5-25d1056dbff92a7662ee73c67596d24906530dbc.tar.gz
hdf5-25d1056dbff92a7662ee73c67596d24906530dbc.tar.bz2
[svn-r12734] Description:
Clean up some compiler warnings. Tested on: FreeBSD/32 4.11 (sleipnir) w/threadsafe Linux/32 2.4 (heping) w/FORTRAN & C++ Linux/64 2.4 (mir) w/enable-1.6-compat
Diffstat (limited to 'hl/test/test_image.c')
-rw-r--r--hl/test/test_image.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/hl/test/test_image.c b/hl/test/test_image.c
index 630b9c5..c1eb866 100644
--- a/hl/test/test_image.c
+++ b/hl/test/test_image.c
@@ -833,7 +833,7 @@ static int read_palette(const char* fname,
{
FILE *file;
char buffer[80];
- int i;
+ unsigned u;
unsigned int red;
unsigned int green;
unsigned int blue;
@@ -919,14 +919,14 @@ static int read_palette(const char* fname,
}
/* ensure there are a sensible number of colors in the palette */
- if ((nentries < 0) || (nentries > 256) || (nentries > palette_size))
+ if ((nentries > 256) || (nentries > palette_size))
{
fclose(file);
return(-1);
}
/* read the palette entries */
- for (i = 0; i < nentries; i++)
+ for (u = 0; u < nentries; u++)
{
/* extract the red, green and blue color components. */
if (fscanf(file, "%u %u %u", &red, &green, &blue) != 3)
@@ -935,9 +935,9 @@ static int read_palette(const char* fname,
return -1;
}
/* store this palette entry */
- palette[i].r = (unsigned char)red;
- palette[i].g = (unsigned char)green;
- palette[i].b = (unsigned char)blue;
+ palette[u].r = (unsigned char)red;
+ palette[u].g = (unsigned char)green;
+ palette[u].b = (unsigned char)blue;
}
/* close file */
@@ -946,5 +946,3 @@ static int read_palette(const char* fname,
return nentries;
}
-
-