From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 4 Jan 2014 16:47:59 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2980
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c29227071ec49ecc0bc6e8d99247b2afb659e1cd;p=imagemagick

---

diff --git a/coders/jp2.c b/coders/jp2.c
index 66c32d844..a8bb80d8a 100644
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -389,8 +389,16 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
           ThrowReaderException(DelegateError,"UnableToDecodeImageFile");
         }
     }
-  if ((opj_decode(jp2_codec,jp2_stream,jp2_image) == 0) ||
-      (opj_end_decompress(jp2_codec,jp2_stream) == 0))
+  if (image_info->number_scenes != 0)
+    jp2_status=opj_get_decoded_tile(jp2_codec,jp2_stream,jp2_image,
+      image_info->scene);
+  else
+    {
+      jp2_status=opj_decode(jp2_codec,jp2_stream,jp2_image);
+      if (jp2_status != 0)
+        jp2_status=opj_end_decompress(jp2_codec,jp2_stream);
+    }
+  if (jp2_status == 0)
     {
       opj_stream_set_user_data(jp2_stream,NULL);
       opj_stream_destroy_v3(jp2_stream);