diff options
| author | Ethan Yonker <dees_troy@teamw.in> | 2015-10-05 05:09:08 +0200 |
|---|---|---|
| committer | Ethan Yonker <dees_troy@teamw.in> | 2015-10-15 16:23:39 +0200 |
| commit | 88037f476f43354725e4fb06e36b56128f33cd5a (patch) | |
| tree | 7c21765296475fdf523a38c4c2f611af1dcb395e /gui/resources.cpp | |
| parent | Fix up twrpTar (diff) | |
| download | android_bootable_recovery-88037f476f43354725e4fb06e36b56128f33cd5a.tar android_bootable_recovery-88037f476f43354725e4fb06e36b56128f33cd5a.tar.gz android_bootable_recovery-88037f476f43354725e4fb06e36b56128f33cd5a.tar.bz2 android_bootable_recovery-88037f476f43354725e4fb06e36b56128f33cd5a.tar.lz android_bootable_recovery-88037f476f43354725e4fb06e36b56128f33cd5a.tar.xz android_bootable_recovery-88037f476f43354725e4fb06e36b56128f33cd5a.tar.zst android_bootable_recovery-88037f476f43354725e4fb06e36b56128f33cd5a.zip | |
Diffstat (limited to '')
| -rw-r--r-- | gui/resources.cpp | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/gui/resources.cpp b/gui/resources.cpp index 41655c376..361f1d8e0 100644 --- a/gui/resources.cpp +++ b/gui/resources.cpp @@ -113,7 +113,6 @@ FontResource::FontResource(xml_node<>* node, ZipArchive* pZip) file = attr->value(); -#ifndef TW_DISABLE_TTF if(file.size() >= 4 && file.compare(file.size()-4, 4, ".ttf") == 0) { m_type = TYPE_TTF; @@ -141,28 +140,8 @@ FontResource::FontResource(xml_node<>* node, ZipArchive* pZip) } } else -#endif { - m_type = TYPE_TWRP; - - if(file.size() >= 4 && file.compare(file.size()-4, 4, ".ttf") == 0) - { - attr = node->first_attribute("fallback"); - if (!attr) - return; - - file = attr->value(); - } - - if (ExtractResource(pZip, "fonts", file, ".dat", TMP_RESOURCE_NAME) == 0) - { - mFont = gr_loadFont(TMP_RESOURCE_NAME); - unlink(TMP_RESOURCE_NAME); - } - else - { - mFont = gr_loadFont(file.c_str()); - } + LOGERR("Non-TTF fonts are no longer supported.\n"); } } @@ -170,12 +149,8 @@ FontResource::~FontResource() { if(mFont) { -#ifndef TW_DISABLE_TTF if(m_type == TYPE_TTF) gr_ttf_freeFont(mFont); - else -#endif - gr_freeFont(mFont); } } |