From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 4 Oct 2014 14:41:20 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1925
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a4f73211739c9e1331bf456ad434021e5141e87;p=imagemagick

---

diff --git a/coders/jp2.c b/coders/jp2.c
index 9fcc6dfac..a47028d97 100644
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -348,6 +348,7 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
       opj_destroy_codec(jp2_codec);
       ThrowReaderException(DelegateError,"UnableToDecodeImageFile");
     }
+  jp2_status=0;
   if ((image->columns != 0) && (image->rows != 0))
     {
       /*
@@ -367,12 +368,13 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
   if (image_info->number_scenes != 0)
     jp2_status=opj_get_decoded_tile(jp2_codec,jp2_stream,jp2_image,
       (unsigned int) image_info->scene);
-  else if (image->ping == MagickFalse)
-    {
-      jp2_status=opj_decode(jp2_codec,jp2_stream,jp2_image);
-      if (jp2_status != 0)
-        jp2_status=opj_end_decompress(jp2_codec,jp2_stream);
-    }
+  else
+    if (image->ping == MagickFalse)
+      {
+        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_destroy(jp2_stream);