From: glennrp <glennrp@git.imagemagick.org>
Date: Sat, 26 Jan 2013 21:20:24 +0000 (+0000)
Subject: Fix IM6-IM7 differences in new png code.
X-Git-Tag: 7.0.1-0~4342
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4dda64fa7c4d4967629a7138cc7a9ce1db4b915e;p=imagemagick

Fix IM6-IM7 differences in new png code.
---

diff --git a/coders/png.c b/coders/png.c
index e775dd7ad..de3ac3da5 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -11267,13 +11267,13 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info,
       mng_info->write_png_depth = 16;
       image->depth = 16;
 
-      if (image->matte == MagickTrue)
-        (void) SetImageType(image,TrueColorMatteType);
+      if (image->alpha_trait == BlendPixelTrait)
+        (void) SetImageType(image,TrueColorMatteType,exception);
 
       else
-        (void) SetImageType(image,TrueColorType);
+        (void) SetImageType(image,TrueColorType,exception);
 
-      (void) SyncImage(image);
+      (void) SyncImage(image,exception);
     }
 
   if (mng_info->write_png64)
@@ -11282,13 +11282,13 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info,
       mng_info->write_png_depth = 16;
       image->depth = 16;
 
-      if (image->matte == MagickTrue)
-        (void) SetImageType(image,TrueColorMatteType);
+      if (image->alpha_trait == BlendPixelTrait)
+        (void) SetImageType(image,TrueColorMatteType,exception);
 
       else
-        (void) SetImageType(image,TrueColorType);
+        (void) SetImageType(image,TrueColorType,exception);
 
-      (void) SyncImage(image);
+      (void) SyncImage(image,exception);
     }
 
   value=GetImageOption(image_info,"png:bit-depth");