Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

change default mapnik fontdir_recurse to true #65

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

change default mapnik fontdir_recurse to true #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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 ------------------------------------------------------------------