BUG: map<>::mapped_type is not part of the STL. Should fix issue on VS* compiler

[gdcm.git] / src / gdcmopenjpeg / codec / image_to_j2k.c

diff --git a/src/gdcmopenjpeg/codec/image_to_j2k.c b/src/gdcmopenjpeg/codec/image_to_j2k.c
index ca0503ddc55d53fdc5a3e1f702bfd1b00311f308..427a5efd37a145f89d7582b830eccb3f35ea7f59 100644 (file)
--- a/src/gdcmopenjpeg/codec/image_to_j2k.c
+++ b/src/gdcmopenjpeg/codec/image_to_j2k.c
@@ -35,7 +35,7 @@
 #include "compat/getopt.h"
 #include "convert.h"
 
-#ifndef WIN32
+#ifndef _WIN32
 #define stricmp strcasecmp
 #define strnicmp strncasecmp
 #endif
@@ -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) {
@@ -239,7 +239,6 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
               "!! Unrecognized format for infile : %s [accept only *.pnm, *.pgm, *.ppm, *.pgx or *.bmp] !!\n\n", 
               infile);
             return 1;
-            break;
         }
         strncpy(parameters->infile, infile, MAX_PATH);
       }
@@ -258,7 +257,6 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
           default:
             fprintf(stderr, "Unknown output format image %s [only *.j2k, *.jp2]!! \n", outfile);
             return 1;
-            break;
         }
         strncpy(parameters->outfile, outfile, MAX_PATH);
       }
@@ -451,11 +449,8 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
         /* ----------------------------------------------------- */
       
       case 'h':      /* display an help description */
-      {
         encode_help_display();
         return 1;
-      }
-      break;
         
         /* ----------------------------------------------------- */
 
@@ -659,7 +654,7 @@ int main(int argc, char **argv) {
   }
 
   if(parameters.cp_comment == NULL) {
-    parameters.cp_comment = "Created by OpenJPEG version 0.9";
+    parameters.cp_comment = "Created by OpenJPEG version 1.0";
     /* no need to delete parameters.cp_comment on exit */
     delete_comment = false;
   }
@@ -675,7 +670,7 @@ int main(int argc, char **argv) {
         return 1;
       }
       break;
-    
+
     case PXM_DFMT:
       image = pnmtoimage(parameters.infile, &parameters);
       if (!image) {