(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 2bcbe6621d7463fb19280037fc36ff93759eb6ac..0ca9e3f28beb0ce55a479f3830e5ac95556e19ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@
   * Enable PFM endian support.
   * Add context to -border for montage.  Inside the parenthesis it adds a border
     to the image otherwise it sets the border for the layout manager.
+  * 24-bit BMP images are not colormapped even if header colors != 0.
 
 2010-05-15  6.6.1-10 Cristy  <quetzlzacatenango@image...>
   * Use ScaleCharToQuantum() in coders/src.c (reference

diff --git a/coders/bmp.c b/coders/bmp.c
index a5471032fc952e0c444ff2f0f70a38e649413aca..bb075a784bd0c22222fd58cac2e46b4cc1ffaae4 100644 (file)
--- a/coders/bmp.c
+++ b/coders/bmp.c
@@ -830,7 +830,7 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
     if ((bmp_info.bits_per_pixel == 16) ||
         (bmp_info.bits_per_pixel == 32))
       image->matte=bmp_info.alpha_mask != 0 ? MagickTrue : MagickFalse;
-    if ((bmp_info.number_colors != 0) || (bmp_info.bits_per_pixel < 16))
+    if ((bmp_info.number_colors != 0) && (bmp_info.bits_per_pixel < 16))
       {
         image->storage_class=PseudoClass;
         image->colors=bmp_info.number_colors;