! : changed
+ : added
+October 18, 2010
+* [antonin] fixed options and help display (patch from winfried)
+
October 18, 2010
! [szukw000]
doc/Makefile.am
}img_fol_t;
void encode_help_display() {
- fprintf(stdout,"HELP\n----\n\n");
+ fprintf(stdout,"HELP for image_to_j2k\n----\n\n");
fprintf(stdout,"- the -h option displays this help information on screen\n\n");
/* UniPG>> */
fprintf(stdout,"-OutFor \n");
fprintf(stdout," REQUIRED only if -ImgDir is used\n");
fprintf(stdout," Need to specify only format without filename <BMP> \n");
- fprintf(stdout," Currently accepts PGM, PPM, PNM, PGX, BMP, TIF, RAW and TGA formats\n");
+ fprintf(stdout," Currently accepts PGM, PPM, PNM, PGX, PNG, BMP, TIF, RAW and TGA formats\n");
fprintf(stdout,"\n");
- fprintf(stdout,"-i : source file (-i source.pnm also *.pgm, *.ppm, *.bmp, *.tif, *.raw, *.tga) \n");
+ fprintf(stdout,"-i : source file (-i source.pnm also *.pgm, *.ppm, *.pgx, *png, *.bmp, *.tif, *.raw, *.tga) \n");
fprintf(stdout," When using this option -o must be used\n");
fprintf(stdout,"\n");
fprintf(stdout,"-o : destination file (-o dest.j2k or .jp2) \n");
};
/* parse the command line */
- const char optlist[] = "i:o:hr:q:n:b:c:t:p:s:SEM:x:R:d:T:If:P:C:F:"
+ const char optlist[] = "i:o:r:q:n:b:c:t:p:s:SEM:x:R:d:T:If:P:C:F:"
#ifdef USE_JPWL
"W:"
#endif /* USE_JPWL */
- ;
+ "h";
totlen=sizeof(long_option);
img_fol->set_out_format=0;
default:
fprintf(stderr,
"!! Unrecognized format for infile : %s "
- "[accept only *.pnm, *.pgm, *.ppm, *.pgx, *.bmp, *.tif, *.raw or *.tga] !!\n\n",
+ "[accept only *.pnm, *.pgm, *.ppm, *.pgx, *png, *.bmp, *.tif, *.raw or *.tga] !!\n\n",
infile);
return 1;
}
}img_fol_t;
void decode_help_display() {
- fprintf(stdout,"HELP\n----\n\n");
+ fprintf(stdout,"HELP for j2k_dump\n----\n\n");
fprintf(stdout,"- the -h option displays this help information on screen\n\n");
/* UniPG>> */
}img_fol_t;
void decode_help_display() {
- fprintf(stdout,"HELP\n----\n\n");
+ fprintf(stdout,"HELP for j2k_to_image\n----\n\n");
fprintf(stdout,"- the -h option displays this help information on screen\n\n");
/* UniPG>> */
fprintf(stdout," -OutFor \n");
fprintf(stdout," REQUIRED only if -ImgDir is used\n");
fprintf(stdout," Need to specify only format without filename <BMP> \n");
- fprintf(stdout," Currently accepts PGM, PPM, PNM, PGX, BMP, TIF, RAW and TGA formats\n");
+ fprintf(stdout," Currently accepts PGM, PPM, PNM, PGX, PNG, BMP, TIF, RAW and TGA formats\n");
fprintf(stdout," -i <compressed file>\n");
fprintf(stdout," REQUIRED only if an Input image directory not specified\n");
fprintf(stdout," Currently accepts J2K-files, JP2-files and JPT-files. The file type\n");
fprintf(stdout," is identified based on its suffix.\n");
fprintf(stdout," -o <decompressed file>\n");
fprintf(stdout," REQUIRED\n");
- fprintf(stdout," Currently accepts PGM, PPM, PNM, PGX, BMP, TIF, RAW and TGA files\n");
+ fprintf(stdout," Currently accepts PGM, PPM, PNM, PGX, PNG, BMP, TIF, RAW and TGA files\n");
fprintf(stdout," Binary data is written to the file (not ascii). If a PGX\n");
fprintf(stdout," filename is given, there will be as many output files as there are\n");
fprintf(stdout," components: an indice starting from 0 will then be appended to the\n");
{"OutFor",REQ_ARG, NULL ,'O'},
};
- const char optlist[] = "i:o:r:l:hx:"
+ const char optlist[] = "i:o:r:l:x:"
/* UniPG>> */
#ifdef USE_JPWL
"W:"
#endif /* USE_JPWL */
/* <<UniPG */
- ;
+ "h" ;
totlen=sizeof(long_option);
img_fol->set_out_format = 0;
while (1) {
mj2_dparameters_t parameters;
if (argc != 3) {
- printf("Bad syntax: Usage: MJ2_extractor mj2filename output_location\n");
- printf("Example: MJ2_extractor foreman.mj2 output/foreman\n");
+ printf("Usage: %s mj2filename output_location\n",argv[0]);
+ printf("Example: %s foreman.mj2 output/foreman\n",argv[0]);
return 1;
}
void help_display()
{
- fprintf(stdout,"HELP\n----\n\n");
+ fprintf(stdout,"HELP for frames_to_mj2\n----\n\n");
fprintf(stdout,"- the -h option displays this help information on screen\n\n");
while (1) {
int c = getopt(argc, argv,
- "i:o:r:q:f:t:n:c:b:p:s:d:h P:S:E:M:R:T:C:I:W:F:");
+ "i:o:r:q:f:t:n:c:b:p:s:d:P:S:E:M:R:T:C:I:W:F:h");
if (c == -1)
break;
switch (c) {
/* -------------- */
if (!mj2_parameters.cod_format || !mj2_parameters.decod_format) {
fprintf(stderr,
- "Correct usage: mj2_encoder -i yuv-file -o mj2-file (+ options)\n");
+ "Usage: %s -i yuv-file -o mj2-file (+ options)\n",argv[0]);
return 1;
}
unsigned int numframes = 0;
if (argc != 3) {
- printf("Bad syntax: Usage: mj2_to_frames inputfile.mj2 outputfile.yuv\n");
- printf("Example: MJ2_decoder foreman.mj2 foreman.yuv\n");
+ printf("Usage: %s inputfile.mj2 outputfile.yuv\n",argv[0]);
return 1;
}
mj2_cparameters_t parameters;
if (argc != 3) {
- printf("Bad syntax: Usage: MJ2_Wrapper source_location mj2_filename\n");
- printf("Example: MJ2_Wrapper input/input output.mj2\n");
+ printf("Usage: %s source_location mj2_filename\n",argv[0]);
+ printf("Example: %s input/input output.mj2\n",argv[0]);
return 1;
}