Merge branch 'dmon-1' into dmon-debugdmon-debug

3 files changed, 2 insertions, 33 deletions

diff --git a/lib/font_renderer/build.sh b/lib/font_renderer/build.sh
deleted file mode 100755
index 364c4b6a..00000000
--- a/lib/font_renderer/build.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-cxxcompiler="g++"
-cxxflags="-Wall -O3 -g -std=c++03 -fno-exceptions -fno-rtti -Isrc -Ilib/font_renderer"
-cxxflags+=" -DFONT_RENDERER_HEIGHT_HACK"
-for package in libagg freetype2; do
-  cxxflags+=" $(pkg-config --cflags $package)"
-done
-
-echo "compiling font renderer library..."
-
-for f in `find lib -name "*.cpp"`; do
-  $cxxcompiler -c $cxxflags $f -o "${f//\//_}.o"
-  if [[ $? -ne 0 ]]; then
-    got_error=true
-  fi
-done
-
-if [[ $got_error ]]; then
-  rm -f *.o
-  exit 1
-fi
-
-ar -rcs libfontrenderer.a *.o
-
-rm *.o
-echo "font renderer library created"
diff --git a/lib/font_renderer/font_renderer.cpp b/lib/font_renderer/font_renderer.cpp
index 8026a89d..14110107 100644
--- a/lib/font_renderer/font_renderer.cpp
+++ b/lib/font_renderer/font_renderer.cpp
@@ -245,7 +245,7 @@ FR_Bitmap *FR_Bake_Font_Bitmap(FR_Renderer *font_renderer, int font_height,
     }
 
     const int glyph_avg_width = glyph_count > 0 ? x_size_sum / (glyph_count * subpixel_scale) : font_height;
-    const int pixels_width = glyph_avg_width * 28;
+    const int pixels_width = glyph_avg_width > 0 ? glyph_avg_width * 28 : 28;
 
     // dry run simulating pixel position to estimate required image's height
     int x = x_start, y = 0, y_bottom = y;
diff --git a/lib/font_renderer/meson.build b/lib/font_renderer/meson.build
index 7724d584..d596e152 100644
--- a/lib/font_renderer/meson.build
+++ b/lib/font_renderer/meson.build
@@ -1,10 +1,6 @@
 freetype_dep = dependency('freetype2')
 
-libagg_dep = dependency('libagg', required: false)
-if not libagg_dep.found()
-  libagg_subproject = subproject('libagg')
-  libagg_dep = libagg_subproject.get_variable('libagg_dep')
-endif
+libagg_dep = dependency('libagg', fallback: ['libagg', 'libagg_dep'])
 
 font_renderer_sources = [
     'agg_font_freetype.cpp',