diff options
| author | Doug Zongker <dougz@google.com> | 2014-03-20 21:05:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-20 21:05:12 +0000 |
| commit | 3e1cadc8f5b4f1a197de1d11606acef8493f0dc6 (patch) | |
| tree | fd675afbbac20825a723d2c0284164addf9fddf3 /minui | |
| parent | 2605dec597f7ebabf31b7e9430f19ab888b2919a (diff) | |
| parent | 03008bc1e89a780e382abe0567e709daecce92ff (diff) | |
| download | bootable_recovery-3e1cadc8f5b4f1a197de1d11606acef8493f0dc6.zip bootable_recovery-3e1cadc8f5b4f1a197de1d11606acef8493f0dc6.tar.gz bootable_recovery-3e1cadc8f5b4f1a197de1d11606acef8493f0dc6.tar.bz2 | |
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
Diffstat (limited to 'minui')
| -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 a0c621b..2bae4de 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 |