commit 3e1cadc8f5b4f1a197de1d11606acef8493f0dc6
author Doug Zongker <dougz@google.com> Thu Mar 20 21:05:12 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 20 21:05:12 2014 +0000
tree fd675afbbac20825a723d2c0284164addf9fddf3
parent 2605dec597f7ebabf31b7e9430f19ab888b2919a
parent 03008bc1e89a780e382abe0567e709daecce92ff

am 03008bc1: am aa4545b5: Merge "restore minui support for paletted images with < 8 bits"

* commit '03008bc1e89a780e382abe0567e709daecce92ff':
  restore minui support for paletted images with < 8 bits

minui/resources.c

diff --git a/minui/resources.c b/minui/resources.c
index a0c621b..2bae4de 100644
--- a/minui/resources.c
+++ b/minui/resources.c
@@ -101,7 +101,7 @@
     } else if (bit_depth <= 8 && *channels == 1 && color_type == PNG_COLOR_TYPE_GRAY) {
         // 1-, 2-, 4-, or 8-bit gray images: expand to 8-bit gray.
         png_set_expand_gray_1_2_4_to_8(*png_ptr);
-    } else if (bit_depth == 8 && *channels == 1 && color_type == PNG_COLOR_TYPE_PALETTE) {
+    } else if (bit_depth <= 8 && *channels == 1 && color_type == PNG_COLOR_TYPE_PALETTE) {
         // paletted images: expand to 8-bit RGB.  Note that we DON'T
         // currently expand the tRNS chunk (if any) to an alpha
         // channel, because minui doesn't support alpha channels in