From: Cristy <urban-warrior@imagemagick.org>
Date: Mon, 9 Jan 2017 21:22:51 +0000 (-0500)
Subject: https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=31016
X-Git-Tag: 7.0.4-4~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eadf2e4228c9d6d304be077414817fe6335c7e14;p=imagemagick

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

diff --git a/ChangeLog b/ChangeLog
index b3e7d1c23..21645cbf7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-01-10  7.0.4-4 Cristy  <quetzlzacatenango@image...>
+  * Recognize XML policy closing tags (reference
+    https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=31182).
+
 2017-01-07  7.0.4-3 Cristy  <quetzlzacatenango@image...>
   * Release ImageMagick version 7.0.4-3, GIT revision 19329:930ca78:20170107.
 
diff --git a/MagickCore/layer.c b/MagickCore/layer.c
index ea1270112..469cf23d2 100644
--- a/MagickCore/layer.c
+++ b/MagickCore/layer.c
@@ -1327,6 +1327,8 @@ static Image *OptimizeLayerFrames(const Image *image,
     prev_image=CloneImage(curr,0,0,MagickTrue,exception);
     if (prev_image == (Image *) NULL)
       break;
+    if (prev_image->alpha_trait == UndefinedPixelTrait)
+      (void) SetImageAlphaChannel(prev_image,OpaqueAlphaChannel,exception);
     if ( disposals[i] == DelDispose ) {
       size_t time = 0;
       while ( disposals[i] == DelDispose ) {