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

fix compile with boost 1.42

Browse source
This commit is contained in:
Dane Springmeyer 2012-02-24 19:22:48 -08:00
parent e6abd143a8
commit 9aff28f768
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
include/mapnik/color_factory.hpp
View file

@ -95,8 +95,8 @@ class MAPNIK_DECL color_factory : boost::noncopyable
{
public:
static void parse_from_string(color & c, std::string const& css_color,
mapnik::css_color_grammar<std::string::const_iterator> g)
static bool parse_from_string(color & c, std::string const& css_color,
mapnik::css_color_grammar<std::string::const_iterator> const& g)
{
std::string::const_iterator first = css_color.begin();
std::string::const_iterator last = css_color.end();
@ -107,15 +107,15 @@ public:
g,
boost::spirit::ascii::space,
css_);
if (!result)
if (result && (first == last))
{
throw config_error(std::string("Failed to parse color value: ") +
"Expected a CSS color, but got '" + css_color + "'");
c.set_red(css_.r);
c.set_green(css_.g);
c.set_blue(css_.b);
c.set_alpha(css_.a);
return true;
}
c.set_red(css_.r);
c.set_green(css_.g);
c.set_blue(css_.b);
c.set_alpha(css_.a);
return false;
}
static void init_from_string(color & c, std::string const& css_color)