diff --git a/deps/agg/include/agg_pixfmt_rgba.h b/deps/agg/include/agg_pixfmt_rgba.h index 6d27d8f42..0de2c840e 100644 --- a/deps/agg/include/agg_pixfmt_rgba.h +++ b/deps/agg/include/agg_pixfmt_rgba.h @@ -1433,9 +1433,9 @@ namespace agg } }; - // color spin + // colorize alpha values template - struct comp_op_rgba_color_spin + struct comp_op_rgba_colorize_alpha { typedef ColorT color_type; typedef Order order_type; @@ -1762,7 +1762,7 @@ namespace agg comp_op_rgba_saturation::blend_pix, comp_op_rgba_color::blend_pix, comp_op_rgba_value::blend_pix, - comp_op_rgba_color_spin::blend_pix, + comp_op_rgba_colorize_alpha::blend_pix, 0 }; @@ -1804,7 +1804,7 @@ namespace agg comp_op_saturation, //----comp_op_saturation comp_op_color, //----comp_op_color comp_op_value, //----comp_op_value - comp_op_color_spin, //----comp_op_color_spin + comp_op_colorize_alpha,//----comp_op_colorize_alpha end_of_comp_op_e }; diff --git a/include/mapnik/image_compositing.hpp b/include/mapnik/image_compositing.hpp index 222b4d972..4bfd6bd4e 100644 --- a/include/mapnik/image_compositing.hpp +++ b/include/mapnik/image_compositing.hpp @@ -75,7 +75,7 @@ enum composite_mode_e saturation, _color, _value, - color_spin + colorize_alpha }; MAPNIK_DECL boost::optional comp_op_from_string(std::string const& name); diff --git a/src/cairo_renderer.cpp b/src/cairo_renderer.cpp index 48997f766..d4b27fcc2 100644 --- a/src/cairo_renderer.cpp +++ b/src/cairo_renderer.cpp @@ -389,7 +389,7 @@ public: case saturation: case _color: case _value: - case color_spin: + case colorize_alpha: break; } } diff --git a/src/image_compositing.cpp b/src/image_compositing.cpp index a02c07e11..8eff43bb5 100644 --- a/src/image_compositing.cpp +++ b/src/image_compositing.cpp @@ -74,7 +74,7 @@ static const comp_op_lookup_type comp_lookup = boost::assign::list_of comp_op_from_string(std::string const& name)