diff options
author | Matt Mower <mowerm@gmail.com> | 2014-04-16 20:43:36 +0200 |
---|---|---|
committer | Ethan Yonker <dees_troy@teamw.in> | 2014-06-04 16:13:37 +0200 |
commit | fb1c4ffaafae4843c7edb302351b7df48e02a990 (patch) | |
tree | 284a58b5a5b9d827e409bd169a06c2a146a662be /gui/pages.cpp | |
parent | Add options to repair or change file system (diff) | |
download | android_bootable_recovery-fb1c4ffaafae4843c7edb302351b7df48e02a990.tar android_bootable_recovery-fb1c4ffaafae4843c7edb302351b7df48e02a990.tar.gz android_bootable_recovery-fb1c4ffaafae4843c7edb302351b7df48e02a990.tar.bz2 android_bootable_recovery-fb1c4ffaafae4843c7edb302351b7df48e02a990.tar.lz android_bootable_recovery-fb1c4ffaafae4843c7edb302351b7df48e02a990.tar.xz android_bootable_recovery-fb1c4ffaafae4843c7edb302351b7df48e02a990.tar.zst android_bootable_recovery-fb1c4ffaafae4843c7edb302351b7df48e02a990.zip |
Diffstat (limited to 'gui/pages.cpp')
-rw-r--r-- | gui/pages.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gui/pages.cpp b/gui/pages.cpp index 398224e17..6586cf8aa 100644 --- a/gui/pages.cpp +++ b/gui/pages.cpp @@ -66,7 +66,7 @@ int ConvertStrToColor(std::string str, COLOR* color) // Translate variables DataManager::GetValue(str, str); - + // Look for some defaults if (str == "black") return 0; else if (str == "white") { color->red = color->green = color->blue = 255; return 0; } @@ -150,8 +150,8 @@ int ActionObject::SetActionPos(int x, int y, int w, int h) if (x < 0 || y < 0) return -1; - mActionX = x; - mActionY = y; + mActionX = x; + mActionY = y; if (w || h) { mActionW = w; @@ -557,7 +557,7 @@ int PageSet::Load(ZipArchive* package) xml_node<>* parent; xml_node<>* child; xml_node<>* templates; - + parent = mDoc.first_node("recovery"); if (!parent) parent = mDoc.first_node("install"); @@ -792,13 +792,13 @@ int PageManager::LoadPackage(std::string name, std::string package, std::string LOGERR("Unable to locate ui.xml in zip file\n"); goto error; } - + // Allocate the buffer for the file len = mzGetZipEntryUncompLen(ui_xml); xmlFile = (char*) malloc(len + 1); if (!xmlFile) goto error; - + if (!mzExtractZipEntryToBuffer(&zip, ui_xml, (unsigned char*) xmlFile)) { LOGERR("Unable to extract ui.xml\n"); @@ -823,7 +823,7 @@ int PageManager::LoadPackage(std::string name, std::string package, std::string { LOGERR("Package %s failed to load.\n", name.c_str()); } - + // The first successful package we loaded is the base if (mBaseSet == NULL) mBaseSet = mCurrentSet; |