]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Mon, 8 Apr 2013 10:33:09 +0000 (10:33 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Mon, 8 Apr 2013 10:33:09 +0000 (10:33 +0000)
coders/jp2.c

index b9cc028e21249630dbba75aacd688ce00ee9f9d8..2507916bf209f2c4df72f0d6cf1ed5b5a2715234 100644 (file)
@@ -335,6 +335,9 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
   Image
     *image;
 
+  int
+    format;
+
   jas_cmprof_t
     *cm_profile;
 
@@ -397,7 +400,8 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
   jp2_stream=JP2StreamManager(image);
   if (jp2_stream == (jas_stream_t *) NULL)
     ThrowReaderException(DelegateError,"UnableToManageJP2Stream");
-  jp2_image=jas_image_decode(jp2_stream,-1,0);
+  format=jas_image_getfmt(jp2_stream);
+  jp2_image=jas_image_decode(jp2_stream,format,0);
   if (jp2_image == (jas_image_t *) NULL)
     {
       (void) jas_stream_close(jp2_stream);