]> granicus.if.org Git - imagemagick/commitdiff
Fixed transparency for 32 bits BMP.
authordirk <dirk@git.imagemagick.org>
Sat, 30 Nov 2013 21:16:04 +0000 (21:16 +0000)
committerdirk <dirk@git.imagemagick.org>
Sat, 30 Nov 2013 21:16:04 +0000 (21:16 +0000)
coders/bmp.c

index 937cd8e620644432f0fe69775d64a3815914f525..77cb3f0a517838497b58bad8ef287e45dcbb1b8f 100644 (file)
@@ -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