summaryrefslogtreecommitdiff
path: root/codec
diff options
context:
space:
mode:
authorFreeimage <freeimage@aliceadsl.fr>2006-01-26 20:02:04 +0000
committerFreeimage <freeimage@aliceadsl.fr>2006-01-26 20:02:04 +0000
commit8a662fa4b1dc489a8d6d5fe687499f25f856ba67 (patch)
tree52da800230f0ad989574402e9c1ce146c08b3824 /codec
parent7546f19b51511ceae65e5b81448d89f18aa2dd75 (diff)
fixed various minor warnings occuring under gcc, added corrections proposed in the forum
Diffstat (limited to 'codec')
-rw-r--r--codec/image_to_j2k.c4
-rw-r--r--codec/j2k_to_image.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/codec/image_to_j2k.c b/codec/image_to_j2k.c
index 5508a260..80de1006 100644
--- a/codec/image_to_j2k.c
+++ b/codec/image_to_j2k.c
@@ -204,7 +204,7 @@ int get_file_format(char *filename) {
static const char *extension[] = {"pgx", "pnm", "pgm", "ppm", "bmp", "j2k", "jp2" };
static const int format[] = { PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, J2K_CFMT, JP2_CFMT };
char * ext = strrchr(filename, '.') + 1;
- for(i = 0; i < sizeof(format); i++) {
+ for(i = 0; i < sizeof(format)/sizeof(*format); i++) {
if(strnicmp(ext, extension[i], 3) == 0) {
return format[i];
}
@@ -221,7 +221,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
/* parse the command line */
while (1) {
- int c = getopt(argc, argv, "i:o:r:q:f:t:n:c:b:x:p:s:d:h:P:S:E:M:R:T:C:I");
+ int c = getopt(argc, argv, "i:o:r:q:f:t:n:c:b:x:p:s:d:hP:S:E:M:R:T:C:I");
if (c == -1)
break;
switch (c) {
diff --git a/codec/j2k_to_image.c b/codec/j2k_to_image.c
index b62c1e33..13338f2c 100644
--- a/codec/j2k_to_image.c
+++ b/codec/j2k_to_image.c
@@ -92,7 +92,7 @@ int get_file_format(char *filename) {
static const int format[] = { PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, J2K_CFMT, JP2_CFMT, JPT_CFMT };
char * ext = strrchr(filename, '.') + 1;
if(ext) {
- for(i = 0; i < sizeof(format); i++) {
+ for(i = 0; i < sizeof(format)/sizeof(*format); i++) {
if(strnicmp(ext, extension[i], 3) == 0) {
return format[i];
}
@@ -108,7 +108,7 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters)
/* parse the command line */
while (1) {
- int c = getopt(argc, argv, "i:o:r:q:f:t:n:c:b:x:p:s:d:h:P:S:E:M:R:T:C:I");
+ int c = getopt(argc, argv, "i:o:r:q:f:t:n:c:b:x:p:s:d:hP:S:E:M:R:T:C:I");
if (c == -1)
break;
switch (c) {