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 30b577c131e576b13729252ce79b15b95d027c5b..19650cb7ade8c86163a4ce0255b574e9032694f4 100644 (file)
--- a/res/CMakeLists.txt
+++ b/res/CMakeLists.txt
@@ -288,7 +288,6 @@ add_resources(
     locales/ru_RU.po
     locales/zh_CN.po
     locales/ja_JP.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 8921d7abe8b0417e71c44bf267665df8fc702f88..497ef38a9bac822e7c1944a455b0a04ab204f5e0 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"));