From: Ryan Pavlik <ryan.pavlik@collabora.com>
Date: Thu, 12 May 2022 21:48:46 +0000 (-0500)
Subject: Use Unifont from system
X-Git-Tag: archive/raspbian/3.1+ds1-3+rpi1^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4a4bd7722535e380fb775cb4f8c0b1f28a430355;p=solvespace.git

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 78d2bd2..64fc439 100644
--- 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 d3fa4ca..f687894 100644
--- 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"));