diff options
| author | Doug Zongker <dougz@google.com> | 2014-03-20 17:31:14 +0100 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-20 17:31:14 +0100 |
| commit | 25c2b2f670a3b11f7ce78eccde10c1a79188c9a8 (patch) | |
| tree | f54e705655976d7f5e8bf3ddd30c2dfc64893ebe | |
| parent | resolved conflicts for merge of 708aa238 to klp-dev-plus-aosp (diff) | |
| parent | Merge "restore minui support for paletted images with < 8 bits" (diff) | |
| download | android_bootable_recovery-25c2b2f670a3b11f7ce78eccde10c1a79188c9a8.tar android_bootable_recovery-25c2b2f670a3b11f7ce78eccde10c1a79188c9a8.tar.gz android_bootable_recovery-25c2b2f670a3b11f7ce78eccde10c1a79188c9a8.tar.bz2 android_bootable_recovery-25c2b2f670a3b11f7ce78eccde10c1a79188c9a8.tar.lz android_bootable_recovery-25c2b2f670a3b11f7ce78eccde10c1a79188c9a8.tar.xz android_bootable_recovery-25c2b2f670a3b11f7ce78eccde10c1a79188c9a8.tar.zst android_bootable_recovery-25c2b2f670a3b11f7ce78eccde10c1a79188c9a8.zip | |
| -rw-r--r-- | minui/resources.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/minui/resources.c b/minui/resources.c index a0c621b71..2bae4ded0 100644 --- a/minui/resources.c +++ b/minui/resources.c @@ -101,7 +101,7 @@ static int open_png(const char* name, png_structp* png_ptr, png_infop* info_ptr, } 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 |