Permalink
Browse files

Merge remote-tracking branch 'origin/master'

  • Loading branch information...
2 parents 72baf59 + 8e0ed96 commit 959a989f52f07d559031a4d46c602c8f7214428c @artemp artemp committed Mar 14, 2012
Showing with 11 additions and 2 deletions.
  1. +2 −2 include/mapnik/agg_helpers.hpp
  2. +8 −0 include/mapnik/xml_tree.hpp
  3. +1 −0 src/color.cpp
@@ -50,8 +50,8 @@ void set_gamma_method(T0 const& obj, T1 & ras_ptr)
default:
ras_ptr->gamma(agg::gamma_power(obj.get_gamma()));
}
-}
+}
}
-#endif //MAPNIK_AGG_HELPERS_HPP
+#endif //MAPNIK_AGG_HELPERS_HPP
@@ -25,7 +25,15 @@
//mapnik
#include <mapnik/xml_node.hpp>
#include <mapnik/expression_grammar.hpp>
+
+// boost
+#include <boost/format.hpp>
+
+#if BOOST_VERSION >= 104500
#include <mapnik/css_color_grammar.hpp>
+#else
+#include <mapnik/css_color_grammar_deprecated.hpp>
+#endif
//stl
#include <string>
View
@@ -166,6 +166,7 @@ bool color_factory::parse_from_string(color & c, std::string const& css_color,
c.set_alpha(css_.a);
return true;
}
+ return false;
#endif
}

0 comments on commit 959a989

Please sign in to comment.