Skip to content

Commit

Permalink
change default mapnik fontdir_recurse to true
Browse files Browse the repository at this point in the history
  • Loading branch information
amandasaurus committed Sep 5, 2024
1 parent 80fe693 commit d6f0658
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
tirex (0.8.0-pre) unstable; urgency=medium

[ Frederik Ramm ]
* preliminary build for github HEAD

[ Amanda McCann ]
* mapnik fontdir_recurse default changed to true

-- Frederik Ramm <[email protected]> Thu, 19 May 2022 13:41:14 +0200

tirex (0.7.0-1) unstable; urgency=medium
Expand Down
2 changes: 1 addition & 1 deletion backend-mapnik/renderd.cc
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ RenderDaemon::RenderDaemon(int argc, char **argv) :
#endif

tmp = getenv("TIREX_BACKEND_CFG_fontdir_recurse");
bool fr = tmp ? atoi(tmp) : false;
bool fr = tmp ? atoi(tmp) : true;
tmp = getenv("TIREX_BACKEND_CFG_fontdir");
if (tmp) loadFonts(tmp, fr);

Expand Down
6 changes: 3 additions & 3 deletions debian/etc/tirex/renderer/mapnik.conf
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ plugindir=/usr/share/tirex/mapnik/input
# throw an exception.
fontdir=/usr/share/fonts/truetype

# Set this to 1 if you want fonts loaded recursively from directories
# inside the mapnik_fontdir directory. Defaults to 0.
fontdir_recurse=1
# Set this to 0 if you don't want fonts loaded recursively from directories
# inside the mapnik_fontdir directory. Defaults to 1, meaning do recurse.
#fontdir_recurse=1

#-- THE END ------------------------------------------------------------------
6 changes: 3 additions & 3 deletions etc/renderer/mapnik.conf.dist
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ plugindir=/usr/lib/mapnik/3.0/input
# throw an exception.
fontdir=/usr/lib/mapnik/fonts

# Set this to 1 if you want fonts loaded recursively from directories
# inside the mapnik_fontdir directory. Defaults to 0.
#fontdir_recurse=0
# Set this to 0 if you don't want fonts loaded recursively from directories
# inside the mapnik_fontdir directory. Defaults to 1, meaning do recurse.
#fontdir_recurse=1

#-- THE END ------------------------------------------------------------------

0 comments on commit d6f0658

Please sign in to comment.