From 839b4e592a7c81bdebe08fae4eef6e909c89acd6 Mon Sep 17 00:00:00 2001 From: Matt Sarett Date: Tue, 10 May 2016 10:12:07 -0400 Subject: [PATCH] DO NOT MERGE Use updated libpng API BUG:23265085 Change-Id: Ibc521fae11dad22283d8469329326ef79525b414 --- minui/resources.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/minui/resources.c b/minui/resources.c index 72f39fba..a370b710 100644 --- a/minui/resources.c +++ b/minui/resources.c @@ -93,9 +93,9 @@ int res_create_surface(const char* name, gr_surface* pSurface) { png_set_sig_bytes(png_ptr, sizeof(header)); png_read_info(png_ptr, info_ptr); - int color_type = info_ptr->color_type; - int bit_depth = info_ptr->bit_depth; - int channels = info_ptr->channels; + int color_type = png_get_color_type(png_ptr, info_ptr); + int bit_depth = png_get_bit_depth(png_ptr, info_ptr); + int channels = png_get_channels(png_ptr, info_ptr); if (!(bit_depth == 8 && ((channels == 3 && color_type == PNG_COLOR_TYPE_RGB) || (channels == 4 && color_type == PNG_COLOR_TYPE_RGBA) || @@ -105,8 +105,8 @@ int res_create_surface(const char* name, gr_surface* pSurface) { goto exit; } - size_t width = info_ptr->width; - size_t height = info_ptr->height; + size_t width = png_get_image_width(png_ptr, info_ptr); + 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 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_read_info(png_ptr, info_ptr); - size_t width = info_ptr->width; - size_t height = info_ptr->height; + size_t width = png_get_image_width(png_ptr, info_ptr); + size_t height = png_get_image_height(png_ptr, info_ptr); size_t stride = 4 * width; - int color_type = info_ptr->color_type; - int bit_depth = info_ptr->bit_depth; - int channels = info_ptr->channels; + int color_type = png_get_color_type(png_ptr, info_ptr); + int bit_depth = png_get_bit_depth(png_ptr, info_ptr); + int channels = png_get_channels(png_ptr, info_ptr); if (!(bit_depth == 8 && (channels == 1 && color_type == PNG_COLOR_TYPE_GRAY))) {