From: dirk <dirk@git.imagemagick.org>
Date: Sun, 28 Sep 2014 08:33:33 +0000 (+0000)
Subject: Added image->ping checks.
X-Git-Tag: 7.0.1-0~1970
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bec9e4d04756d15e3f52af1528ba2b5c9eba0df2;p=imagemagick

Added image->ping checks.
---

diff --git a/coders/jp2.c b/coders/jp2.c
index d920f023f..9fcc6dfac 100644
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -367,7 +367,7 @@ 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
+  else if (image->ping == MagickFalse)
     {
       jp2_status=opj_decode(jp2_codec,jp2_stream,jp2_image);
       if (jp2_status != 0)
@@ -418,6 +418,13 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
       if (profile != (StringInfo *) NULL)
         SetImageProfile(image,"icc",profile,exception);
     }
+  if (image->ping != MagickFalse)
+    {
+      opj_destroy_codec(jp2_codec);
+      opj_image_destroy(jp2_image);
+      opj_destroy_cstr_index(&codestream_index);
+      return(GetFirstImageInList(image));
+    }
   for (y=0; y < (ssize_t) image->rows; y++)
   {
     register Quantum