From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 31 Jan 2015 01:51:55 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1342
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=95adadecab521f86b197a0b1269182f1eca7cc38;p=imagemagick

---

diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c
index e6c3575ff..de1f580d7 100644
--- a/MagickCore/attribute.c
+++ b/MagickCore/attribute.c
@@ -855,7 +855,7 @@ MagickExport MagickBooleanType IsImageOpaque(const Image *image,
       p+=GetPixelChannels(image);
     }
     if (x < (ssize_t) image->columns)
-     break;
+      break;
   }
   image_view=DestroyCacheView(image_view);
   return(y < (ssize_t) image->rows ? MagickFalse : MagickTrue);
diff --git a/coders/avs.c b/coders/avs.c
index a88c102ea..011a4a37e 100644
--- a/coders/avs.c
+++ b/coders/avs.c
@@ -182,6 +182,8 @@ static Image *ReadAVSImage(const ImageInfo *image_info,ExceptionInfo *exception)
         SetPixelRed(image,ScaleCharToQuantum(*p++),q);
         SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
         SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
+        if (GetPixelAlpha(image,q) != OpaqueAlpha)
+          image->alpha_trait=BlendPixelTrait;
         q+=GetPixelChannels(image);
       }
       if (SyncAuthenticPixels(image,exception) == MagickFalse)