From 67777213913ca6f0ebd5bb83375315ba8b9ad5f1 Mon Sep 17 00:00:00 2001 From: Jiri Drbalek Date: Mon, 11 Sep 2017 15:25:19 +0000 Subject: [PATCH 1/3] enclosing calls forgotten in https://github.com/mapnik/mapnik/pull/3474 --- include/mapnik/feature_style_processor_impl.hpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/mapnik/feature_style_processor_impl.hpp b/include/mapnik/feature_style_processor_impl.hpp index 926b19ed7..278ea5463 100644 --- a/include/mapnik/feature_style_processor_impl.hpp +++ b/include/mapnik/feature_style_processor_impl.hpp @@ -213,8 +213,12 @@ void feature_style_processor::apply_to_layer(layer const& lay, if (!mat.active_styles_.empty()) { + p.start_layer_processing(mat.lay_, mat.layer_ext2_); + render_material(mat,p); render_submaterials(mat, p); + + p.end_layer_processing(mat.lay_); } } From 01574e8038b37a8912be5ecea2be00cb20c92dac Mon Sep 17 00:00:00 2001 From: Artem Pavlenko Date: Tue, 12 Sep 2017 09:43:50 +0100 Subject: [PATCH 2/3] update comment --- src/expression.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/expression.cpp b/src/expression.cpp index d58078813..b1633b2aa 100644 --- a/src/expression.cpp +++ b/src/expression.cpp @@ -50,7 +50,7 @@ expression_ptr parse_expression(std::string const& str) } catch (boost::spirit::x3::expectation_failure const& ex) { - // no need to show "boost::spirit::qi::expectation_failure" which is a std::runtime_error + // no need to show "boost::spirit::x3::expectation_failure" which is a std::runtime_error throw config_error("Failed to parse expression: \"" + str + "\""); } catch (std::exception const& ex) From 02c61245596ba560723b52ee308eda034453e648 Mon Sep 17 00:00:00 2001 From: Artem Pavlenko Date: Tue, 12 Sep 2017 09:54:40 +0100 Subject: [PATCH 3/3] Revert "remove legacy defines" This reverts commit ebb8d3b3ed8fca0f04e6598d6e649f8df9db2252. --- SConstruct | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/SConstruct b/SConstruct index b49ab8ffa..cb1152815 100644 --- a/SConstruct +++ b/SConstruct @@ -807,7 +807,7 @@ int main() return ret def CheckIcuData(context, silent=False): - + if not silent: context.Message('Checking for ICU data directory...') ret = context.TryRun(""" @@ -834,7 +834,7 @@ int main() { return ret[1].strip() def CheckGdalData(context, silent=False): - + if not silent: context.Message('Checking for GDAL data directory...') ret = context.TryRun(""" @@ -857,7 +857,7 @@ int main() { return ret[1].strip() def CheckProjData(context, silent=False): - + if not silent: context.Message('Checking for PROJ_LIB directory...') ret = context.TryRun(""" @@ -1891,6 +1891,10 @@ if not preconfigured: debug_defines = ['-DDEBUG', '-DMAPNIK_DEBUG'] ndebug_defines = ['-DNDEBUG'] + # faster compile + # http://www.boost.org/doc/libs/1_47_0/libs/spirit/doc/html/spirit/what_s_new/spirit_2_5.html#spirit.what_s_new.spirit_2_5.breaking_changes + env.Append(CPPDEFINES = '-DBOOST_SPIRIT_NO_PREDEFINED_TERMINALS=1') + env.Append(CPPDEFINES = '-DBOOST_PHOENIX_NO_PREDEFINED_TERMINALS=1') # c++11 support / https://github.com/mapnik/mapnik/issues/1683 # - upgrade to PHOENIX_V3 since that is needed for c++11 compile env.Append(CPPDEFINES = '-DBOOST_SPIRIT_USE_PHOENIX_V3=1')