diff options
| author | Ethan Yonker <dees_troy@teamw.in> | 2014-11-07 20:32:55 +0100 |
|---|---|---|
| committer | Ethan Yonker <dees_troy@teamw.in> | 2014-11-07 20:33:07 +0100 |
| commit | 5a95c3ff415dd3b00b68aa2e7f662f9852f49c18 (patch) | |
| tree | b9305cc274e0a1550b4db02e0f2133fdefa3fffe | |
| parent | Add new needed libs for 5.0 recovery (diff) | |
| download | android_bootable_recovery-5a95c3ff415dd3b00b68aa2e7f662f9852f49c18.tar android_bootable_recovery-5a95c3ff415dd3b00b68aa2e7f662f9852f49c18.tar.gz android_bootable_recovery-5a95c3ff415dd3b00b68aa2e7f662f9852f49c18.tar.bz2 android_bootable_recovery-5a95c3ff415dd3b00b68aa2e7f662f9852f49c18.tar.lz android_bootable_recovery-5a95c3ff415dd3b00b68aa2e7f662f9852f49c18.tar.xz android_bootable_recovery-5a95c3ff415dd3b00b68aa2e7f662f9852f49c18.tar.zst android_bootable_recovery-5a95c3ff415dd3b00b68aa2e7f662f9852f49c18.zip | |
| -rw-r--r-- | gui/pages.cpp | 2 | ||||
| -rw-r--r-- | minui/resources.c | 4 | ||||
| -rw-r--r-- | 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; |