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
diff --git a/gui/pages.cpp b/gui/pages.cpp
index 3632cc3..4df6a18 100644
--- a/gui/pages.cpp
+++ b/gui/pages.cpp
@@ -921,7 +921,7 @@
// 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 605edbc..fe1e999 100644
--- a/minui/resources.c
+++ b/minui/resources.c
@@ -100,10 +100,10 @@
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 3b833cc..4dd10a9 100644
--- a/minuitwrp/resources.c
+++ b/minuitwrp/resources.c
@@ -100,10 +100,10 @@
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;