tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

DO NOT MERGE Use updated libpng API

Browse source 
BUG:23265085
Change-Id: Ibc521fae11dad22283d8469329326ef79525b414
This commit is contained in:
Matt Sarett 2016-05-10 10:12:07 -04:00
parent ec63d564a8
commit 839b4e592a
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
minui/resources.c
View file

@ -93,9 +93,9 @@ int res_create_surface(const char* name, gr_surface* pSurface) {
png_set_sig_bytes(png_ptr, sizeof(header)); png_set_sig_bytes(png_ptr, sizeof(header));
png_read_info(png_ptr, info_ptr); png_read_info(png_ptr, info_ptr);
int color_type = info_ptr->color_type; int color_type = png_get_color_type(png_ptr, info_ptr);
int bit_depth = info_ptr->bit_depth; int bit_depth = png_get_bit_depth(png_ptr, info_ptr);
int channels = info_ptr->channels; int channels = png_get_channels(png_ptr, info_ptr);
if (!(bit_depth == 8 && if (!(bit_depth == 8 &&
((channels == 3 && color_type == PNG_COLOR_TYPE_RGB) || ((channels == 3 && color_type == PNG_COLOR_TYPE_RGB) ||
(channels == 4 && color_type == PNG_COLOR_TYPE_RGBA) || (channels == 4 && color_type == PNG_COLOR_TYPE_RGBA) ||
@ -105,8 +105,8 @@ int res_create_surface(const char* name, gr_surface* pSurface) {
goto exit; goto exit;
} }
size_t width = info_ptr->width; size_t width = png_get_image_width(png_ptr, info_ptr);
size_t height = info_ptr->height; size_t height = png_get_image_height(png_ptr, info_ptr);
size_t stride = (color_type == PNG_COLOR_TYPE_GRAY ? 1 : 4) * width; size_t stride = (color_type == PNG_COLOR_TYPE_GRAY ? 1 : 4) * width;
size_t pixelSize = stride * height; size_t pixelSize = stride * height;
@ -246,13 +246,13 @@ int res_create_localized_surface(const char* name, gr_surface* pSurface) {
png_set_sig_bytes(png_ptr, sizeof(header)); png_set_sig_bytes(png_ptr, sizeof(header));
png_read_info(png_ptr, info_ptr); png_read_info(png_ptr, info_ptr);
size_t width = info_ptr->width; size_t width = png_get_image_width(png_ptr, info_ptr);
size_t height = info_ptr->height; size_t height = png_get_image_height(png_ptr, info_ptr);
size_t stride = 4 * width; size_t stride = 4 * width;
int color_type = info_ptr->color_type; int color_type = png_get_color_type(png_ptr, info_ptr);
int bit_depth = info_ptr->bit_depth; int bit_depth = png_get_bit_depth(png_ptr, info_ptr);
int channels = info_ptr->channels; int channels = png_get_channels(png_ptr, info_ptr);
if (!(bit_depth == 8 && if (!(bit_depth == 8 &&
(channels == 1 && color_type == PNG_COLOR_TYPE_GRAY))) { (channels == 1 && color_type == PNG_COLOR_TYPE_GRAY))) {