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

Merge pull request #1266 from mapnik/rename-color-spin-to-colorize-alpha

Browse source 
Rename color-spin composite operation to colorize alpha
This commit is contained in:
Artem Pavlenko 2012-06-19 14:37:17 -07:00
commit 1027de4f16
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
deps/agg/include/agg_pixfmt_rgba.h vendored
View file

@ -1433,9 +1433,9 @@ namespace agg
} }
}; };
// color spin // colorize alpha values
template <typename ColorT, typename Order> template <typename ColorT, typename Order>
struct comp_op_rgba_color_spin struct comp_op_rgba_colorize_alpha
{ {
typedef ColorT color_type; typedef ColorT color_type;
typedef Order order_type; typedef Order order_type;
@ -1762,7 +1762,7 @@ namespace agg
comp_op_rgba_saturation<ColorT,Order>::blend_pix, comp_op_rgba_saturation<ColorT,Order>::blend_pix,
comp_op_rgba_color<ColorT,Order>::blend_pix, comp_op_rgba_color<ColorT,Order>::blend_pix,
comp_op_rgba_value<ColorT,Order>::blend_pix, comp_op_rgba_value<ColorT,Order>::blend_pix,
comp_op_rgba_color_spin<ColorT,Order>::blend_pix, comp_op_rgba_colorize_alpha<ColorT,Order>::blend_pix,
0 0
}; };
@ -1804,7 +1804,7 @@ namespace agg
comp_op_saturation, //----comp_op_saturation comp_op_saturation, //----comp_op_saturation
comp_op_color, //----comp_op_color comp_op_color, //----comp_op_color
comp_op_value, //----comp_op_value 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 end_of_comp_op_e
}; };

2
include/mapnik/image_compositing.hpp
View file

@ -75,7 +75,7 @@ enum composite_mode_e
saturation, saturation,
_color, _color,
_value, _value,
color_spin colorize_alpha
}; };
MAPNIK_DECL boost::optional<composite_mode_e> comp_op_from_string(std::string const& name); MAPNIK_DECL boost::optional<composite_mode_e> comp_op_from_string(std::string const& name);

2
src/cairo_renderer.cpp
View file

@ -389,7 +389,7 @@ public:
case saturation: case saturation:
case _color: case _color:
case _value: case _value:
case color_spin: case colorize_alpha:
break; break;
} }
} }

2
src/image_compositing.cpp
View file

@ -74,7 +74,7 @@ static const comp_op_lookup_type comp_lookup = boost::assign::list_of<comp_op_lo
(saturation,"saturation") (saturation,"saturation")
(_color,"color") (_color,"color")
(_value,"value") (_value,"value")
(color_spin,"color-spin") (colorize_alpha,"colorize-alpha")
; ;
boost::optional<composite_mode_e> comp_op_from_string(std::string const& name) boost::optional<composite_mode_e> comp_op_from_string(std::string const& name)