Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a95c3ff authored by Ethan Yonker's avatar Ethan Yonker
Browse files

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
parent 67eb72ae

gui/pages.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

minui/resources.c

+2 −2
Original line number Diff line number Diff line
@@ -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) ||

minuitwrp/resources.c

+2 −2
Original line number Diff line number Diff line
@@ -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;