commit aa4545b5aedae165c8d2db0009dcdfa18e4f7923
author Doug Zongker <dougz@google.com> Thu Mar 20 15:28:31 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 20 15:28:32 2014 +0000
tree 4efd22caccd76cf24d16ec3090c5d8729c425797
parent 708aa23801b0bc8349ab017c92c0deaf9d767c52
parent 577a1304352c12d968c11a667f50cd45498cae17

Merge "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