From: dirk <dirk@git.imagemagick.org>
Date: Sat, 30 Nov 2013 21:16:04 +0000 (+0000)
Subject: Fixed transparency for 32 bits BMP.
X-Git-Tag: 7.0.1-0~3079
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c2dce49f3c435630fdbe932505a6362fb33d7172;p=imagemagick

Fixed transparency for 32 bits BMP.
---

diff --git a/coders/bmp.c b/coders/bmp.c
index 937cd8e62..77cb3f0a5 100644
--- a/coders/bmp.c
+++ b/coders/bmp.c
@@ -857,9 +857,9 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
     image->columns=(size_t) MagickAbsoluteValue(bmp_info.width);
     image->rows=(size_t) MagickAbsoluteValue(bmp_info.height);
     image->depth=bmp_info.bits_per_pixel <= 8 ? bmp_info.bits_per_pixel : 8;
-    image->alpha_trait=(bmp_info.alpha_mask != 0) &&
-      (bmp_info.compression == BI_BITFIELDS) ? BlendPixelTrait :
-      UndefinedPixelTrait;
+    image->alpha_trait=((bmp_info.alpha_mask != 0) &&
+      (bmp_info.compression == BI_BITFIELDS) ||
+      (bmp_info.bits_per_pixel == 32)) ? BlendPixelTrait : UndefinedPixelTrait;
     if (bmp_info.bits_per_pixel < 16)
       {
         size_t