From 62b75ab66a94ffef29d0568c4d54d63a02aff814 Mon Sep 17 00:00:00 2001 From: Dees Troy Date: Fri, 2 May 2014 13:20:33 +0000 Subject: Update minui to support overlay graphics Fix path in minuitwrp for includes Change-Id: I9e9e5f67e8574cdcbc6f8873ceeb56eab71143ed --- minui/resources.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'minui/resources.c') diff --git a/minui/resources.c b/minui/resources.c index c0a9ccacb..39f83c76f 100644 --- a/minui/resources.c +++ b/minui/resources.c @@ -33,7 +33,11 @@ #include "minui.h" +#ifdef FASTMMI_FEATURE +char *locale = NULL; +#else extern char* locale; +#endif // libpng gives "undefined reference to 'pow'" errors, and I have no // idea how to convince the build system to link with -lm. We don't @@ -93,13 +97,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, bit_depth; - size_t width, height; - png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, - &color_type, NULL, NULL, NULL); - - int channels = png_get_channels(png_ptr, info_ptr); - + int color_type = info_ptr->color_type; + int bit_depth = info_ptr->bit_depth; + int channels = info_ptr->channels; if (!(bit_depth == 8 && ((channels == 3 && color_type == PNG_COLOR_TYPE_RGB) || (channels == 4 && color_type == PNG_COLOR_TYPE_RGBA) || @@ -109,6 +109,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 stride = (color_type == PNG_COLOR_TYPE_GRAY ? 1 : 4) * width; size_t pixelSize = stride * height; @@ -248,11 +250,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); - int color_type, bit_depth; - size_t width, height; - png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, - &color_type, NULL, NULL, NULL); - int channels = png_get_channels(png_ptr, info_ptr); + size_t width = info_ptr->width; + size_t height = info_ptr->height; + size_t stride = 4 * width; + + int color_type = info_ptr->color_type; + int bit_depth = info_ptr->bit_depth; + int channels = info_ptr->channels; if (!(bit_depth == 8 && (channels == 1 && color_type == PNG_COLOR_TYPE_GRAY))) { -- cgit v1.2.3