From: Dirk Lemstra <dirk@git.imagemagick.org>
Date: Sat, 16 Sep 2017 13:35:37 +0000 (+0200)
Subject: Fix merge mistakes I made.
X-Git-Tag: 7.0.7-3~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5334114fb86a0ff38ac338bb8dc1d57841b1b3a8;p=imagemagick

Fix merge mistakes I made.
---

diff --git a/coders/png.c b/coders/png.c
index f2119dbc2..5e7c9073d 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -4638,7 +4638,6 @@ static Image *ReadOneJNGImage(MngInfo *mng_info,
           {
             DestroyJNG(chunk,&color_image,&color_image_info,
               &alpha_image,&alpha_image_info);
-            DestroyJNG(chunk,&color_image,&color_image_info, &alpha_image,&alpha_image_info);
             return(DestroyImageList(image));
           }
 
@@ -4651,7 +4650,6 @@ static Image *ReadOneJNGImage(MngInfo *mng_info,
               {
                 DestroyJNG(chunk,&color_image,&color_image_info,
                   &alpha_image,&alpha_image_info);
-                DestroyJNG(chunk,&color_image,&color_image_info, &alpha_image,&alpha_image_info);
                 ThrowReaderException(ResourceLimitError,
                   "MemoryAllocationFailed");
               }
@@ -4661,9 +4659,8 @@ static Image *ReadOneJNGImage(MngInfo *mng_info,
 
             if (alpha_image == (Image *) NULL)
               {
-                  DestroyJNG(chunk,&color_image,&color_image_info,
-                    &alpha_image,&alpha_image_info);
-                DestroyJNG(chunk,&color_image,&color_image_info, &alpha_image,&alpha_image_info);
+                DestroyJNG(chunk,&color_image,&color_image_info,
+                  &alpha_image,&alpha_image_info);
                 ThrowReaderException(ResourceLimitError,
                   "MemoryAllocationFailed");
               }
@@ -4678,10 +4675,8 @@ static Image *ReadOneJNGImage(MngInfo *mng_info,
 
             if (status == MagickFalse)
               {
-                alpha_image=DestroyImage(alpha_image);
-                alpha_image_info=DestroyImageInfo(alpha_image_info);
-                color_image=DestroyImage(color_image);
-                DestroyJNG(chunk,&color_image,&color_image_info, &alpha_image,&alpha_image_info);
+                DestroyJNG(chunk,&color_image,&color_image_info,
+                  &alpha_image,&alpha_image_info);
                 return(DestroyImageList(image));
               }
 
@@ -4981,7 +4976,8 @@ static Image *ReadOneJNGImage(MngInfo *mng_info,
   if (status == MagickFalse)
     {
       jng_image=DestroyImage(jng_image);
-      DestroyJNG(NULL,&color_image,&color_image_info, &alpha_image,&alpha_image_info);
+      DestroyJNG(NULL,&color_image,&color_image_info,
+        &alpha_image,&alpha_image_info);
       return(DestroyImageList(image));
     }