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

re-enable colorizer support

Browse source
This commit is contained in:
Artem Pavlenko 2012-01-17 14:16:03 -05:00
parent df0a898775
commit 78ffbe68cb
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/mapnik/raster_colorizer.hpp
View file

@ -143,7 +143,8 @@ typedef std::vector<colorizer_stop> colorizer_stops;
//! \brief Class representing the raster colorizer
class MAPNIK_DECL raster_colorizer {
class MAPNIK_DECL raster_colorizer
{
public:
//! \brief Constructor
raster_colorizer(colorizer_mode mode = COLORIZER_LINEAR, color const& _color = color(0,0,0,0));
@ -196,8 +197,8 @@ public:
//! \brief Colorize a raster
//!
//! \param[in, out] raster A raster stored in float32 single channel format, which gets colorized in place.
//! \param[in] properties belonging to the feature, used to find 'NODATA' information if available
void colorize(raster_ptr const& raster,std::map<std::string,value> const& Props) const;
//! \param[in] feature used to find 'NODATA' information if available
void colorize(raster_ptr const& raster, Feature const& f) const;
//! \brief Perform the translation of input to output

9
src/agg/process_raster_symbolizer.cpp
View file

@ -46,12 +46,11 @@ void agg_renderer<T>::process(raster_symbolizer const& sym,
raster_ptr const& source=feature.get_raster();
if (source)
{
// FIXME
// If there's a colorizer defined, use it to color the raster in-place
//raster_colorizer_ptr colorizer = sym.get_colorizer();
//if (colorizer)
// colorizer->colorize(source,feature.props());
raster_colorizer_ptr colorizer = sym.get_colorizer();
if (colorizer)
colorizer->colorize(source,feature);
box2d<double> target_ext = box2d<double>(source->ext_);
prj_trans.backward(target_ext, PROJ_ENVELOPE_POINTS);