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
This commit is contained in:
Ethan Yonker
2014-11-07 13:32:55 -06:00
parent 67eb72ae4d
commit 5a95c3ff41
3 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -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;
+2 -2
View File
@@ -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) ||
+2 -2
View File
@@ -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;