From: Cristy <urban-warrior@imagemagick.org>
Date: Wed, 13 Jun 2018 22:57:07 +0000 (-0400)
Subject: https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=34121
X-Git-Tag: 7.0.8-1~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=329ef3ae501a796fdd29347f2069f4f5a7db73a7;p=imagemagick

https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=34121
---

diff --git a/ChangeLog b/ChangeLog
index 8a9fef8fb..af7c2d298 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-06-13  7.0.8-1  <quetzlzacatenango@image...>
+  * PNG: set storage class to DirectClass if alpha enabled (reference
+    https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=34121).
+
 2018-06-12  7.0.8-0 Cristy  <quetzlzacatenango@image...>
   * Release ImageMagick version 7.0.8-0, GIT revision 14459:d7c892d5a:20180612.
 
diff --git a/coders/png.c b/coders/png.c
index fe14a93bf..285daf8df 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -4036,6 +4036,8 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
         ((int) ping_color_type == PNG_COLOR_TYPE_GRAY_ALPHA) ||
         (png_get_valid(ping,ping_info,PNG_INFO_tRNS))) ?
         BlendPixelTrait : UndefinedPixelTrait;
+    if (image->alpha_trait == BlendPixelTrait)
+      (void) SetImageStorageClass(image,DirectClass,exception);
 
 #if 0  /* I'm not sure what's wrong here but it does not work. */
     if (image->alpha_trait != UndefinedPixelTrait)