sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into bbox-index

Browse source
This commit is contained in:
Artem Pavlenko 2017-09-12 14:57:12 +01:00
commit acec6ae824
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
SConstruct
View file

@ -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')

4
include/mapnik/feature_style_processor_impl.hpp
View file

@ -213,8 +213,12 @@ void feature_style_processor<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_);
}
}

2
src/expression.cpp
View file

@ -50,7 +50,7 @@ expression_ptr parse_expression(std::string const& str)
}
catch (boost::spirit::x3::expectation_failure<std::string::const_iterator> 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)