diff --git a/deps/agg/include/agg_pixfmt_rgba.h b/deps/agg/include/agg_pixfmt_rgba.h index 41e6923f0..576219d28 100644 --- a/deps/agg/include/agg_pixfmt_rgba.h +++ b/deps/agg/include/agg_pixfmt_rgba.h @@ -1450,6 +1450,9 @@ namespace agg }; // colorize alpha values + // TODO - consider moving to image-filters: + // https://github.com/mapnik/mapnik/issues/1371 + /* template struct comp_op_rgba_colorize_alpha { @@ -1503,6 +1506,7 @@ namespace agg } } }; + */ // grain extract (GIMP) // E = I - M + 128 @@ -1790,7 +1794,7 @@ namespace agg comp_op_rgba_saturation::blend_pix, comp_op_rgba_color::blend_pix, comp_op_rgba_value::blend_pix, - comp_op_rgba_colorize_alpha::blend_pix, + //comp_op_rgba_colorize_alpha::blend_pix, 0 }; @@ -1832,7 +1836,7 @@ namespace agg comp_op_saturation, //----comp_op_saturation comp_op_color, //----comp_op_color comp_op_value, //----comp_op_value - comp_op_colorize_alpha,//----comp_op_colorize_alpha + //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 c4fbef407..6d5d05fab 100644 --- a/include/mapnik/image_compositing.hpp +++ b/include/mapnik/image_compositing.hpp @@ -74,8 +74,8 @@ enum composite_mode_e hue, saturation, _color, - _value, - colorize_alpha + _value + //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 a4096fed2..923562c0c 100644 --- a/src/cairo_renderer.cpp +++ b/src/cairo_renderer.cpp @@ -387,7 +387,7 @@ public: case saturation: case _color: case _value: - case colorize_alpha: + //case colorize_alpha: break; } } diff --git a/src/image_compositing.cpp b/src/image_compositing.cpp index e6c64100e..8912dae12 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) diff --git a/tests/data/good_maps/colorize-alpha.xml b/tests/data/good_maps/colorize-alpha.xml index 625a55b40..8fd39e7cd 100644 --- a/tests/data/good_maps/colorize-alpha.xml +++ b/tests/data/good_maps/colorize-alpha.xml @@ -7,8 +7,11 @@ - + + +