]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Fri, 3 Jan 2014 00:55:02 +0000 (00:55 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Fri, 3 Jan 2014 00:55:02 +0000 (00:55 +0000)
coders/jp2.c

index ddc0d59a61b3840a6085c0ca82d436c7c4e9ee52..407798bbedd22c452e2b3e837561af6d45c74b60 100644 (file)
@@ -374,18 +374,13 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
       opj_destroy_codec(jp2_codec);
       ThrowReaderException(DelegateError,"UnableToDecodeImageFile");
     }
-  if (image_info->extract != (char *) NULL)
+  if ((image->columns != 0) && (image->rows != 0))
     {
-      RectangleInfo
-        geometry;
-
       /*
         Extract an area from the image.
       */
-      SetGeometry(image,&geometry);
-      (void) ParseAbsoluteGeometry(image_info->extract,&geometry);
-      jp2_status=opj_set_decode_area(jp2_codec,jp2_image,geometry.x,
-        geometry.y,geometry.width,geometry.height);
+      jp2_status=opj_set_decode_area(jp2_codec,jp2_image,image->extract_info.x,
+        image->extract_info.x,image->columns,image->rows);
       if (jp2_status == 0)
         {
           opj_stream_set_user_data(jp2_stream,NULL);