change -v option was renamed to -u, which is equivalent to -TP long option

4 files changed, 13 insertions, 8 deletions

diff --git a/CHANGES b/CHANGES
index e7b18f2a..e0121f1a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,7 @@ October 11, 2011
 * [mickael] WIP: add stream length value to read unknown marker size, backport 855 into V2 framework, correct memory leak into get_cstr_info
 * [mickael] WIP: add output elements about decoding of jp2 files with last tile part lenght equal zero
 * [mickael] WIP: correct mistake with JP2 files and manage correctly the text_GBR.jp2 filecase
+! [kaori]   change -v option was renamed to -u, which is equivalent to -TP long option
 
 October 10, 2011
 * [vincent] fix 'distcheck' rule
diff --git a/applications/JavaOpenJPEG/JavaOpenJPEG.c b/applications/JavaOpenJPEG/JavaOpenJPEG.c
index 0926b77c..c8df0061 100644
--- a/applications/JavaOpenJPEG/JavaOpenJPEG.c
+++ b/applications/JavaOpenJPEG/JavaOpenJPEG.c
@@ -204,6 +204,8 @@ void encode_help_display() {
 	fprintf(stdout,"                 Indicate multiple modes by adding their values. \n");

 	fprintf(stdout,"                 ex: RESTART(4) + RESET(2) + SEGMARK(32) = -M 38\n");

 	fprintf(stdout,"\n");

+	fprintf(stdout,"-TP          : devide packets of every tile into tile-parts (-TP R) [R, L, C]\n");

+	fprintf(stdout,"\n");

 	fprintf(stdout,"-x           : create an index file *.Idx (-x index_name.Idx) \n");

 	fprintf(stdout,"\n");

 	fprintf(stdout,"-ROI         : c=%%d,U=%%d : quantization indices upshifted \n");

@@ -499,7 +501,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
 		{"cinema2K",REQ_ARG, NULL ,'w'},

 		{"cinema4K",NO_ARG, NULL ,'y'},

 		{"ImgDir",REQ_ARG, NULL ,'z'},

-		{"TP",REQ_ARG, NULL ,'v'},

+		{"TP",REQ_ARG, NULL ,'u'},

 		{"SOP",NO_ARG, NULL ,'S'},

 		{"EPH",NO_ARG, NULL ,'E'},

 		{"OutFor",REQ_ARG, NULL ,'O'},

@@ -510,7 +512,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
 

 	/* parse the command line */

 /* UniPG>> */

-	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:hr:q:n:b:c:t:p:s:SEM:x:R:d:T:If:P:C:F:u:"

 #ifdef USE_JPWL

 		"W:"

 #endif /* USE_JPWL */

@@ -871,7 +873,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
 

 			/* ------------------------------------------------------ */

 			

-			case 'v':			/* Tile part generation*/

+			case 'u':			/* Tile part generation*/

 			{

 				parameters->tp_flag = opj_optarg[0];

 				parameters->tp_on = 1;

diff --git a/applications/codec/image_to_j2k.c b/applications/codec/image_to_j2k.c
index 759a8626..0a1aa588 100644
--- a/applications/codec/image_to_j2k.c
+++ b/applications/codec/image_to_j2k.c
@@ -193,6 +193,8 @@ void encode_help_display(void) {
 	fprintf(stdout,"                 Indicate multiple modes by adding their values. \n");
 	fprintf(stdout,"                 ex: RESTART(4) + RESET(2) + SEGMARK(32) = -M 38\n");
 	fprintf(stdout,"\n");
+	fprintf(stdout,"-TP          : devide packets of every tile into tile-parts (-TP R) [R, L, C]\n");
+	fprintf(stdout,"\n");
 	fprintf(stdout,"-x           : create an index file *.Idx (-x index_name.Idx) \n");
 	fprintf(stdout,"\n");
 	fprintf(stdout,"-ROI         : c=%%d,U=%%d : quantization indices upshifted \n");
@@ -581,7 +583,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
 		{"cinema2K",REQ_ARG, NULL ,'w'},
 		{"cinema4K",NO_ARG, NULL ,'y'},
 		{"ImgDir",REQ_ARG, NULL ,'z'},
-		{"TP",REQ_ARG, NULL ,'v'},
+		{"TP",REQ_ARG, NULL ,'u'},
 		{"SOP",NO_ARG, NULL ,'S'},
 		{"EPH",NO_ARG, NULL ,'E'},
 		{"OutFor",REQ_ARG, NULL ,'O'},
@@ -591,7 +593,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
 	};
 
 	/* parse the command line */
-	const char optlist[] = "i:o:r:q:n:b:c:t:p:s:SEM:x:R:d:T:If:P:C:F:v:"
+	const char optlist[] = "i:o:r:q:n:b:c:t:p:s:SEM:x:R:d:T:If:P:C:F:u:"
 #ifdef USE_JPWL
 		"W:"
 #endif /* USE_JPWL */
@@ -1005,7 +1007,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
 
 			/* ------------------------------------------------------ */
 
-			case 'v':			/* Tile part generation*/
+			case 'u':			/* Tile part generation*/
 			{
 				parameters->tp_flag = opj_optarg[0];
 				parameters->tp_on = 1;
diff --git a/applications/jpip/README b/applications/jpip/README
index 0bd22fda..9842b936 100644
--- a/applications/jpip/README
+++ b/applications/jpip/README
@@ -126,11 +126,11 @@ Client:
 ----------
 
 An example to encode a TIF image "copenhague1.tif" at resolution 4780x4050, 8bit/pixel, grayscale.
-   % ./image_to_j2k -i copenhague1.tif -o copenhague1.jp2 -p RPCL -c [64,64] -t 640,480 -jpip -v R
+   % ./image_to_j2k -i copenhague1.tif -o copenhague1.jp2 -p RPCL -c [64,64] -t 640,480 -jpip -TP R
 
  options
   -jpip : embed index table box into the output JP2 file (obligation for JPIP)
-  -v R  : partition a tile into tile parts of different resolution levels (obligation for JPT-stream)
+  -TP R : partition a tile into tile parts of different resolution levels (obligation for JPT-stream)
 
 <Option>
  3. Embed metadata into JP2 file