PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libtwrpgui: convert gui to use new ziparchive library

Browse Source 
Change-Id: Iea94855257c6d02c2f663c25d390cb1cfb91a727
This commit is contained in:
bigbiff
2021-01-17 11:06:57 -05:00
parent 28653c98b0
commit d81833a5e5
48 changed files with 660 additions and 777 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui/resources.cpp
+6 -5
View File
@@ -37,8 +37,8 @@ extern "C" {
#include "gui.h"
}
#include "../minuitwrp/truetype.hpp"
#include "../minuitwrp/minui.h"
#include "minuitwrp/truetype.hpp"
#include "minuitwrp/minui.h"
#include "rapidxml.hpp"
#include "objects.hpp"
@@ -100,7 +100,7 @@ void Resource::LoadImage(ZipArchiveHandle pZip, std::string file, gr_surface* su
void Resource::CheckAndScaleImage(gr_surface source, gr_surface* destination, int retain_aspect)
{
if (!source) {
*destination = NULL;
*destination = nullptr;
return;
}
if (get_scale_w() != 0 && get_scale_h() != 0) {
@@ -214,7 +214,7 @@ ImageResource::ImageResource(xml_node<>* node, ZipArchiveHandle pZip)
: Resource(node, pZip)
{
std::string file;
gr_surface temp_surface = NULL;
gr_surface temp_surface = nullptr;
mSurface = NULL;
if (!node) {
@@ -264,7 +264,8 @@ AnimationResource::AnimationResource(xml_node<>* node, ZipArchiveHandle pZip)
std::ostringstream fileName;
fileName << file << std::setfill ('0') << std::setw (3) << fileNum;
gr_surface surface, temp_surface = NULL;
gr_surface surface = nullptr;
gr_surface temp_surface = nullptr;
LoadImage(pZip, fileName.str(), &temp_surface);
CheckAndScaleImage(temp_surface, &surface, retain_aspect);
if (surface) {