Use Unifont from system

Forwarded: not-needed

Gbp-Pq: Name 04_use_system_unifont.patch

diff --git a/res/CMakeLists.txt b/res/CMakeLists.txt
index 78d2bd2688b9e3f800a886f65e353237f62865f7..64fc439d8c4259bedae89d4f1a81018c47f6475a 100644 (file)
--- a/res/CMakeLists.txt
+++ b/res/CMakeLists.txt
@@ -270,7 +270,6 @@ add_resources(
     locales/tr_TR.po
     locales/ru_RU.po
     locales/zh_CN.po
-    fonts/unifont.hex.gz
     fonts/private/0-check-false.png
     fonts/private/1-check-true.png
     fonts/private/2-radio-false.png

diff --git a/src/resource.cpp b/src/resource.cpp
index d3fa4caab909674fd0b415699a2e95d1f98d9e7b..f68789400f58096bf917a2e82b988e24a2b6b2ac 100644 (file)
--- a/src/resource.cpp
+++ b/src/resource.cpp
@@ -669,7 +669,7 @@ size_t BitmapFont::GetWidth(const std::string &str) {
 }
 
 BitmapFont BitmapFont::Create() {
-    BitmapFont Font = BitmapFont::From(LoadStringFromGzip("fonts/unifont.hex.gz"));
+    BitmapFont Font = BitmapFont::From(LoadString("fonts/unifont.hex"));
     // Unifont doesn't have a glyph for U+0020.
     Font.AddGlyph(0x0020, Pixmap::Create(Pixmap::Format::RGB, 8, 16));
     Font.AddGlyph(0xE000, LoadPng("fonts/private/0-check-false.png"));