diff options
| author | Antonin Descampe <antonin@gmail.com> | 2014-04-23 09:12:30 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2014-04-23 09:12:30 +0000 |
| commit | 08c09b74cf08975c018ad9e735afbdb7f63afb58 (patch) | |
| tree | 17fc474a1d60235dc2f31fc8d9c6e57e5722e996 /src/bin/jp2/opj_compress.c | |
| parent | 7aece5e8e7d4214d140a45aca50a824ff8092924 (diff) | |
[trunk]formatted some messages. Removed -version option to disambiguate
with -v(erbose) option, added version info in help display
Diffstat (limited to 'src/bin/jp2/opj_compress.c')
| -rw-r--r-- | src/bin/jp2/opj_compress.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/bin/jp2/opj_compress.c b/src/bin/jp2/opj_compress.c index 4da8eaee..dc27fb62 100644 --- a/src/bin/jp2/opj_compress.c +++ b/src/bin/jp2/opj_compress.c @@ -86,7 +86,9 @@ typedef struct img_folder{ }img_fol_t; static void encode_help_display(void) { - fprintf(stdout,"HELP for opj_compress\n----\n\n"); + fprintf(stdout,"This is the opj_compress utility from the OpenJPEG project.\n" + "It has been compiled against openjp2 library v%s.\n\n",opj_version()); + fprintf(stdout,"HELP\n----\n\n"); fprintf(stdout,"- the -h option displays this help information on screen\n\n"); /* UniPG>> */ @@ -467,8 +469,7 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param {"POC",REQ_ARG, NULL ,'P'}, {"ROI",REQ_ARG, NULL ,'R'}, {"jpip",NO_ARG, NULL, 'J'}, - {"mct",REQ_ARG, NULL, 'Y'}, - {"version",NO_ARG, NULL, 'v'} + {"mct",REQ_ARG, NULL, 'Y'} }; /* parse the command line */ @@ -476,7 +477,7 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param #ifdef USE_JPWL "W:" #endif /* USE_JPWL */ - "hv"; + "h"; totlen=sizeof(long_option); img_fol->set_out_format=0; @@ -843,13 +844,6 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param /* ----------------------------------------------------- */ - case 'v': /* display the openjpeg library version in use */ - fprintf(stdout,"This is the opj_compress utility from the OpenJPEG project.\n" - "It has been compiled against openjp2 library v%s.\n",opj_version()); - return 1; - - /* ----------------------------------------------------- */ - case 'P': /* POC */ { int numpocs = 0; /* number of progression order change (POC) default 0 */ |