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

Merge branch 'master' of github.com:mapnik/mapnik into stats_processor

Browse source
This commit is contained in:
Dane Springmeyer 2013-01-24 22:06:40 -08:00
commit 37daca644a
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/cairo_renderer.cpp
View file

@ -36,7 +36,6 @@
#include <mapnik/parse_path.hpp> #include <mapnik/parse_path.hpp>
#include <mapnik/marker.hpp> #include <mapnik/marker.hpp>
#include <mapnik/marker_cache.hpp> #include <mapnik/marker_cache.hpp>
#include <mapnik/unicode.hpp>
#include <mapnik/font_set.hpp> #include <mapnik/font_set.hpp>
#include <mapnik/parse_path.hpp> #include <mapnik/parse_path.hpp>
#include <mapnik/map.hpp> #include <mapnik/map.hpp>

8
src/expression.cpp
View file

@ -24,12 +24,11 @@
#include <mapnik/expression.hpp> #include <mapnik/expression.hpp>
#include <mapnik/config_error.hpp> #include <mapnik/config_error.hpp>
#include <mapnik/unicode.hpp> #include <mapnik/unicode.hpp>
#include <mapnik/expression_node.hpp> #include <mapnik/expression_node_types.hpp>
#include <mapnik/expression_grammar.hpp> #include <mapnik/expression_grammar.hpp>
#include <boost/spirit/include/qi.hpp> #include <boost/spirit/include/qi.hpp>
// boost // boost
#include <boost/algorithm/string.hpp>
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
namespace mapnik namespace mapnik
@ -39,7 +38,6 @@ expression_ptr parse_expression(std::string const& str, std::string const& encod
{ {
transcoder tr(encoding); transcoder tr(encoding);
expression_grammar<std::string::const_iterator> g(tr); expression_grammar<std::string::const_iterator> g(tr);
return parse_expression(str, g); return parse_expression(str, g);
} }
@ -47,12 +45,10 @@ expression_ptr parse_expression(std::string const& str,
mapnik::expression_grammar<std::string::const_iterator> const& g) mapnik::expression_grammar<std::string::const_iterator> const& g)
{ {
expr_node node; expr_node node;
std::string::const_iterator itr = str.begin(); std::string::const_iterator itr = str.begin();
std::string::const_iterator end = str.end(); std::string::const_iterator end = str.end();
bool r = boost::spirit::qi::phrase_parse(itr, end, g, boost::spirit::standard_wide::space, node); bool r = boost::spirit::qi::phrase_parse(itr, end, g, boost::spirit::standard_wide::space, node);
if (r && itr==end) if (r && itr == end)
{ {
return boost::make_shared<expr_node>(node); return boost::make_shared<expr_node>(node);
} }