# HG changeset patch
# User John Swensen <jpswensen@gmail.com>
# Date 1285709032 14400
# Node ID 6589aaf769f6c17bbaa077885133ed49c0475b2c
# Parent  d9c8916bb9dd52130bb5f830c268e38adbc9deb1
Correctly handle logical and integer bit depths

diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-28  John P. Swensen  <jpswensen@gmail.com>
+
+	* DLD-FUNCTIONS/__magick_read__.cc (encode_uint_image)
+	(encode_bool_image): Ensure bit depth encoding is correct for
+	logical, uint8, and uint16 images.
+
 2010-09-28  Jaroslav Hajek  <highegg@gmail.com>
 
 	* xpow.cc (xpow (double, const Matrix&)): Ensure real result for
diff --git a/src/DLD-FUNCTIONS/__magick_read__.cc b/src/DLD-FUNCTIONS/__magick_read__.cc
--- a/src/DLD-FUNCTIONS/__magick_read__.cc
+++ b/src/DLD-FUNCTIONS/__magick_read__.cc
@@ -617,6 +617,10 @@
             }
         }
 
+      im.quantizeColorSpace (Magick::GRAYColorspace);
+      im.quantizeColors (2);
+      im.quantize ();
+
       imvec.push_back (im);
     }
 }
@@ -743,6 +747,10 @@
                   im.pixelColor (y, x, c);
                 }
             }
+
+          im.quantizeColorSpace (Magick::GRAYColorspace);
+          im.quantizeColors (pow (2, bitdepth));
+          im.quantize ();
         }
 
       imvec.push_back (im);