X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Fjp2%2Fopj_compress.c;h=f6474d9773d31912ea61918d192fa204ce9b606a;hb=2c7eb4fed9cbed43ae402840f6706998ce2dd1c4;hp=2ef1c6be608a36a3479173cd8388466c95ffd42e;hpb=563bd8499e63db976ca8358216138647593354bc;p=openjpeg.git

diff --git a/src/bin/jp2/opj_compress.c b/src/bin/jp2/opj_compress.c
index 2ef1c6be..f6474d97 100644
--- a/src/bin/jp2/opj_compress.c
+++ b/src/bin/jp2/opj_compress.c
@@ -169,7 +169,7 @@ static void encode_help_display(void)
     fprintf(stdout, "    Different compression ratios for successive layers.\n");
     fprintf(stdout,
             "    The rate specified for each quality level is the desired\n");
-    fprintf(stdout, "    compression factor.\n");
+    fprintf(stdout, "    compression factor (use 1 for lossless)\n");
     fprintf(stdout, "    Decreasing ratios required.\n");
     fprintf(stdout, "      Example: -r 20,10,1 means \n");
     fprintf(stdout, "            quality layer 1: compress 20x, \n");
@@ -178,7 +178,8 @@ static void encode_help_display(void)
     fprintf(stdout, "    Options -r and -q cannot be used together.\n");
     fprintf(stdout, "-q <psnr value>,<psnr value>,<psnr value>,...\n");
     fprintf(stdout, "    Different psnr for successive layers (-q 30,40,50).\n");
-    fprintf(stdout, "    Increasing PSNR values required.\n");
+    fprintf(stdout, "    Increasing PSNR values required, except 0 which can\n");
+    fprintf(stdout, "    be used for the last layer to indicate it is lossless.\n");
     fprintf(stdout, "    Options -r and -q cannot be used together.\n");
     fprintf(stdout, "-n <number of resolutions>\n");
     fprintf(stdout, "    Number of resolutions.\n");
@@ -204,7 +205,7 @@ static void encode_help_display(void)
     fprintf(stdout,
             "    resolution levels. The last specified record is right-shifted for each \n");
     fprintf(stdout, "    remaining lower resolution levels.\n");
-    fprintf(stdout, "    Default: 215x215 at each resolution.\n");
+    fprintf(stdout, "    Default: 2^15x2^15 at each resolution.\n");
     fprintf(stdout, "-t <tile width>,<tile height>\n");
     fprintf(stdout, "    Tile size.\n");
     fprintf(stdout,
@@ -907,8 +908,9 @@ static int parse_cmdline_encoder(int argc, char **argv,
         case 'b': {         /* code-block dimension */
             int cblockw_init = 0, cblockh_init = 0;
             sscanf(opj_optarg, "%d,%d", &cblockw_init, &cblockh_init);
-            if (cblockw_init * cblockh_init > 4096 || cblockw_init > 1024
-                    || cblockw_init < 4 || cblockh_init > 1024 || cblockh_init < 4) {
+            if (cblockw_init > 1024 || cblockw_init < 4 ||
+                    cblockh_init > 1024 || cblockh_init < 4 ||
+                    cblockw_init * cblockh_init > 4096) {
                 fprintf(stderr,
                         "!! Size of code_block error (option -b) !!\n\nRestriction :\n"
                         "    * width*height<=4096\n    * 4<=width,height<= 1024\n\n");
@@ -1618,9 +1620,12 @@ static int parse_cmdline_encoder(int argc, char **argv,
         return 1;
     }               /* mod fixed_quality */
 
+
     /* if no rate entered, lossless by default */
+    /* Note: post v2.2.0, this is no longer necessary, but for released */
+    /* versions at the time of writing, this is needed to avoid crashes */
     if (parameters->tcp_numlayers == 0) {
-        parameters->tcp_rates[0] = 0;   /* MOD antonin : losslessbug */
+        parameters->tcp_rates[0] = 0;
         parameters->tcp_numlayers++;
         parameters->cp_disto_alloc = 1;
     }
@@ -1694,7 +1699,8 @@ OPJ_FLOAT64 opj_clock(void)
     /* cout << "freq = " << ((double) freq.QuadPart) << endl; */
     /* t is the high resolution performance counter (see MSDN) */
     QueryPerformanceCounter(& t) ;
-    return freq.QuadPart ? (t.QuadPart / (OPJ_FLOAT64) freq.QuadPart) : 0 ;
+    return freq.QuadPart ? ((OPJ_FLOAT64) t.QuadPart / (OPJ_FLOAT64) freq.QuadPart)
+           : 0 ;
 #else
     /* Unix or Linux: use resource usage */
     struct rusage t;