X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmopenjpeg%2Fcodec%2Fj2k_to_image.c;h=86324fd1895ddc41a3d366b8d887a20918841ef3;hb=c83e397d97f923aea948fc10a8c4162820f6820e;hp=56d89ef789f0c550b67e4a3b4b2c66930e49c487;hpb=62ba44019992fac89cad65f7756f8ad13972c23c;p=gdcm.git

diff --git a/src/gdcmopenjpeg/codec/j2k_to_image.c b/src/gdcmopenjpeg/codec/j2k_to_image.c
index 56d89ef7..86324fd1 100644
--- a/src/gdcmopenjpeg/codec/j2k_to_image.c
+++ b/src/gdcmopenjpeg/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) {
@@ -126,7 +126,6 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters)
               "!! Unrecognized format for infile : %s [accept only *.j2k, *.jp2, *.jpc or *.jpt] !!\n\n", 
               infile);
             return 1;
-            break;
         }
         strncpy(parameters->infile, infile, MAX_PATH);
       }
@@ -146,7 +145,6 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters)
           default:
             fprintf(stderr, "Unknown output format image %s [only *.pnm, *.pgm, *.ppm, *.pgx or *.bmp]!! \n", outfile);
             return 1;
-            break;
         }
         strncpy(parameters->outfile, outfile, MAX_PATH);
       }
@@ -173,11 +171,8 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters)
         /* ----------------------------------------------------- */
       
       case 'h':       /* display an help description */
-      {
         decode_help_display();
         return 1;
-      }
-      break;
             
         /* ----------------------------------------------------- */
       
@@ -360,7 +355,6 @@ int main(int argc, char **argv) {
     default:
       fprintf(stderr, "ERROR -> j2k_to_image : Unknown input image format\n");
       return 1;
-      break;
   }
   
   /* free the memory containing the code-stream */