commit 73bbee1c22e299bd29a1f2f8e1ccec66923bcccc
author cristy <urban-warrior@git.imagemagick.org> Sun Jan 05 00:43:38 2014 +0000
committer cristy <urban-warrior@git.imagemagick.org> Sun Jan 05 00:43:38 2014 +0000
tree 0a45c26238ca63f6ceae1553e1d3f4cb0f6069ca
parent dbcde6a93041525383070b0f40339fd48291d9f0

coders/jp2.c

diff --git a/coders/jp2.c b/coders/jp2.c
index e9b117e..0a8b67a 100644
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -681,7 +681,8 @@
   ExceptionInfo *exception)
 {
   const char
-    *value;
+    *option,
+    *property;
 
   int
     jp2_status;
@@ -738,6 +739,9 @@
     if (((1UL << (i+2)) > image->columns) && ((1UL << (i+2)) > image->rows))
       break;
   parameters.numresolution=i;
+  option=GetImageOption(image_info,"jp2:number-resolutions");
+  if (option != (const char *) NULL)
+    parameters.numresolution=StringToInteger(option);
   parameters.tcp_numlayers=1;
   parameters.tcp_distoratio[0]=(double) image->quality;
   parameters.cp_fixed_quality=OPJ_TRUE;
@@ -763,8 +767,8 @@
         parameters.cp_ty0=geometry.y;
       parameters.tile_size_on=OPJ_TRUE;
     }
-  value=GetImageArtifact(image,"jp2:quality");
-  if (value != (const char *) NULL)
+  option=GetImageOption(image_info,"jp2:quality");
+  if (option != (const char *) NULL)
     {
       register const char
         *p;
@@ -772,7 +776,7 @@
       /*
         Set quality PSNR.
       */
-      p=value;
+      p=option;
       for (i=1; sscanf(p,"%f",&parameters.tcp_distoratio[i]) == 1; i++)
       {
         if (i > 100)
@@ -786,8 +790,8 @@
       parameters.tcp_numlayers=i;
       parameters.cp_fixed_quality=OPJ_TRUE;
     }
-  value=GetImageArtifact(image,"jp2:rate");
-  if (value != (const char *) NULL)
+  option=GetImageOption(image_info,"jp2:rate");
+  if (option != (const char *) NULL)
     {
       register const char
         *p;
@@ -795,7 +799,7 @@
       /*
         Set compression rate.
       */
-      p=value;
+      p=option;
       for (i=1; sscanf(p,"%f",&parameters.tcp_rates[i]) == 1; i++)
       {
         if (i > 100)
@@ -809,6 +813,10 @@
       parameters.tcp_numlayers=i;
       parameters.cp_disto_alloc=OPJ_TRUE;
     }
+  option=GetImageOption(image_info,"jp2:sampling-factor");
+  if (option != (const char *) NULL)
+    (void) sscanf(option,"%d,%d",&parameters.subsampling_dx, 
+      &parameters.subsampling_dy);  
 #if defined(BUGINOPENJPEG)
   if ((image->depth == 12) &&
       ((image->columns == 2048) || (image->rows == 1080) ||
@@ -835,9 +843,9 @@
         }
     }
 #endif
-  value=GetImageProperty(image,"comment",exception);
-  if (value != (const char *) NULL)
-    parameters.cp_comment=ConstantString(value);
+  property=GetImageProperty(image,"comment",exception);
+  if (property != (const char *) NULL)
+    parameters.cp_comment=ConstantString(property);
   channels=3;
   jp2_colorspace=OPJ_CLRSPC_SRGB;
   if (image->colorspace == YUVColorspace)