]> granicus.if.org Git - imagemagick/commitdiff
Fix IM6-IM7 differences in new png code.
authorglennrp <glennrp@git.imagemagick.org>
Sat, 26 Jan 2013 21:20:24 +0000 (21:20 +0000)
committerglennrp <glennrp@git.imagemagick.org>
Sat, 26 Jan 2013 21:20:24 +0000 (21:20 +0000)
coders/png.c

index e775dd7ad402dc73f1df3c670c23e79759490a84..de3ac3da500599d59af5ed9040a3f5d7c5411934 100644 (file)
@@ -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");