commit 252f31796e4e925b3ee88a068ded0181eff66dc6
author cristy <urban-warrior@git.imagemagick.org> Thu Nov 15 12:37:50 2012 +0000
committer cristy <urban-warrior@git.imagemagick.org> Thu Nov 15 12:37:50 2012 +0000
tree f621995d9f352784ac96976de5813c42b4517e15
parent 9d4918ba8d9ac4309651dfca5c74223ab66fd651

coders/bmp.c

diff --git a/coders/bmp.c b/coders/bmp.c
index cf61a30..e771295 100644
--- a/coders/bmp.c
+++ b/coders/bmp.c
@@ -840,7 +840,7 @@
     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) || 
+    image->alpha_trait=(bmp_info.alpha_mask != 0) &&
       ((bmp_info.compression == BI_RGB) && (bmp_info.bits_per_pixel == 32)) ? 
       BlendPixelTrait : UndefinedPixelTrait;
     if ((bmp_info.number_colors != 0) || (bmp_info.bits_per_pixel < 16))