From 612b4a020788832b2f4a5d5b4f20a7278bc3805f Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 2 Oct 2014 12:04:32 -0700 Subject: [PATCH] min compiler is g++ 4.8 - refs #2486 --- INSTALL.md | 2 +- src/agg/process_debug_symbolizer.cpp | 1 + src/load_map.cpp | 7 +++++++ tests/visual_tests/styles/hb-fontsets.xml | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index c75eccbe0..95fe2531a 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -50,7 +50,7 @@ For troubleshooting help see https://github.com/mapnik/mapnik/wiki/InstallationT Build system dependencies are: - * C++ compiler (like g++ or clang++) + * C++ compiler supporting `-std=c++11` (like >= g++ 4.8 or >= clang++ 3.4) * >= 2 GB RAM (> 5 GB for g++) * Python 2.4-2.7 * Scons (a copy is bundled) diff --git a/src/agg/process_debug_symbolizer.cpp b/src/agg/process_debug_symbolizer.cpp index ecd37907a..0044fe5e4 100644 --- a/src/agg/process_debug_symbolizer.cpp +++ b/src/agg/process_debug_symbolizer.cpp @@ -65,6 +65,7 @@ void agg_renderer::process(debug_symbolizer const& sym, draw_rect(pixmap_, itr->box); } } + // TODO - random color per feature else if (mode == DEBUG_SYM_MODE_VERTEX) { for (auto const& geom : feature.paths()) diff --git a/src/load_map.cpp b/src/load_map.cpp index a87f37e00..a6a47400c 100644 --- a/src/load_map.cpp +++ b/src/load_map.cpp @@ -495,6 +495,13 @@ void map_parser::parse_fontset(Map & map, xml_node const& node) { success = true; } + else + { + // https://github.com/mapnik/mapnik/issues/1791 + MAPNIK_LOG_ERROR(fontset) << "warning: unable to find face-name '" + << n.get_attr("face-name","") + << "' in FontSet '" << fontset.get_name() << "'"; + } } } diff --git a/tests/visual_tests/styles/hb-fontsets.xml b/tests/visual_tests/styles/hb-fontsets.xml index 6310edb32..855660990 100644 --- a/tests/visual_tests/styles/hb-fontsets.xml +++ b/tests/visual_tests/styles/hb-fontsets.xml @@ -1,7 +1,7 @@ + > My Style