From e0a765429f50bc2bb0a5da2d5db46151947feaa9 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Tue, 11 Jan 2011 00:15:57 +0000 Subject: [PATCH] if a directory is not passed to register_fonts, then assume it is a font file and try registering it --- src/font_engine_freetype.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/font_engine_freetype.cpp b/src/font_engine_freetype.cpp index 8cf51ef96..dc4b9d79f 100644 --- a/src/font_engine_freetype.cpp +++ b/src/font_engine_freetype.cpp @@ -88,7 +88,13 @@ bool freetype_engine::register_font(std::string const& file_name) bool freetype_engine::register_fonts(std::string const& dir, bool recurse) { boost::filesystem::path path(dir); - if (!boost::filesystem::exists(path) || !boost::filesystem::is_directory(path)) return false; + + if (!boost::filesystem::exists(path)) + return false; + + if (!boost::filesystem::is_directory(path)) + return mapnik::freetype_engine::register_font(dir); + boost::filesystem::directory_iterator end_itr; for (boost::filesystem::directory_iterator itr(dir); itr != end_itr; ++itr) {