PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow paletted RGB images in recovery

Browse Source 
Recovery assumes any paletted images are in RGBA format.  Make it
handle both RGB and RGBA paletted images.

Bug: 3514884
Change-Id: I517cd571aa3f434dacacc33a774236260aec20ef
This commit is contained in:
Doug Zongker
2011-03-04 16:28:48 -08:00
parent 73bb6f749f
commit 68189f2994
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
minui/resources.c
+7 -2
View File
@@ -121,12 +121,17 @@ int res_create_surface(const char* name, gr_surface* pSurface) {
surface->format = (channels == 3) ? surface->format = (channels == 3) ?
GGL_PIXEL_FORMAT_RGBX_8888 : GGL_PIXEL_FORMAT_RGBA_8888; GGL_PIXEL_FORMAT_RGBX_8888 : GGL_PIXEL_FORMAT_RGBA_8888;
int alpha = 0;
if (color_type == PNG_COLOR_TYPE_PALETTE) { if (color_type == PNG_COLOR_TYPE_PALETTE) {
png_set_palette_to_rgb(png_ptr); png_set_palette_to_rgb(png_ptr);
}
if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
png_set_tRNS_to_alpha(png_ptr);
alpha = 1;
} }
int y; int y;
if (channels == 3) { if (channels == 3 || (channels == 1 && !alpha)) {
for (y = 0; y < height; ++y) { for (y = 0; y < height; ++y) {
unsigned char* pRow = pData + y * stride; unsigned char* pRow = pData + y * stride;
png_read_row(png_ptr, pRow, NULL); png_read_row(png_ptr, pRow, NULL);