From 5a95c3ff415dd3b00b68aa2e7f662f9852f49c18 Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Fri, 7 Nov 2014 13:32:55 -0600 Subject: Disable custom theme and fix png loading We will have to update the zip handling later. Now at least TWRP boots up to the GUI. Change-Id: I4182896eb095cab52fb0f1c9c20b6605e35677b9 --- gui/pages.cpp | 2 +- minui/resources.c | 4 ++-- minuitwrp/resources.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gui/pages.cpp b/gui/pages.cpp index 3632cc311..4df6a181f 100644 --- a/gui/pages.cpp +++ b/gui/pages.cpp @@ -921,7 +921,7 @@ int PageManager::LoadPackage(std::string name, std::string package, std::string // Open the XML file LOGINFO("Loading package: %s (%s)\n", name.c_str(), package.c_str()); - if (mzOpenZipArchive(package.c_str(), &zip)) + if (1 || mzOpenZipArchive(package.c_str(), &zip)) { // We can try to load the XML directly... struct stat st; diff --git a/minui/resources.c b/minui/resources.c index 605edbca7..fe1e99926 100644 --- a/minui/resources.c +++ b/minui/resources.c @@ -100,10 +100,10 @@ int res_create_surface(const char* name, gr_surface* pSurface) { int color_type, bit_depth; size_t width, height; - png_get_IHDR(png_ptr, info_ptr, width, height, &bit_depth, + png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, NULL, NULL, NULL); - png_byte* channels = png_get_channels(png_ptr, info_ptr); + png_byte channels = png_get_channels(png_ptr, info_ptr); if (!(bit_depth == 8 && ((channels == 3 && color_type == PNG_COLOR_TYPE_RGB) || diff --git a/minuitwrp/resources.c b/minuitwrp/resources.c index 3b833cc70..4dd10a9de 100644 --- a/minuitwrp/resources.c +++ b/minuitwrp/resources.c @@ -100,10 +100,10 @@ int res_create_surface_png(const char* name, gr_surface* pSurface) { int color_type, bit_depth; size_t width, height; - png_get_IHDR(png_ptr, info_ptr, width, height, &bit_depth, + png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, NULL, NULL, NULL); - png_byte* channels = png_get_channels(png_ptr, info_ptr); + png_byte channels = png_get_channels(png_ptr, info_ptr); size_t stride = 4 * width; size_t pixelSize = stride * height; -- cgit v1.2.3