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 d893f938dd2d1394804169df6d69e1a27c2743a8..85b6e493c0d0cfde2d67ff25447be5cc5652a716 100644 (file)
--- a/res/CMakeLists.txt
+++ b/res/CMakeLists.txt
@@ -259,7 +259,6 @@ add_resources(
     locales/uk_UA.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 7b19081e1d00cc1b678fe77faf31c4d074d79bb4..e8a51bbb0c7e6600e2e3d71a51d4d62c93cd36e7 100644 (file)
--- a/src/resource.cpp
+++ b/src/resource.cpp
@@ -665,7 +665,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"));