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];
}
/* 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) {
"!! 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);
}
default:
fprintf(stderr, "Unknown output format image %s [only *.j2k, *.jp2]!! \n", outfile);
return 1;
- break;
}
strncpy(parameters->outfile, outfile, MAX_PATH);
}
/* ----------------------------------------------------- */
case 'h': /* display an help description */
- {
encode_help_display();
return 1;
- }
- break;
/* ----------------------------------------------------- */
}
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;
}
return 1;
}
break;
-
+
case PXM_DFMT:
image = pnmtoimage(parameters.infile, ¶meters);
if (!image) {