From fbbd1d4dcf4decbec4dd79fc21c0e9304c347293 Mon Sep 17 00:00:00 2001
From: Artem Pavlenko <artem@mapnik.org>
Date: Tue, 17 Jan 2012 14:16:03 -0500
Subject: [PATCH] re-enable colorizer support

---
 include/mapnik/raster_colorizer.hpp   | 7 ++++---
 src/agg/process_raster_symbolizer.cpp | 9 ++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/mapnik/raster_colorizer.hpp b/include/mapnik/raster_colorizer.hpp
index 150cd833c..090900dd8 100644
--- a/include/mapnik/raster_colorizer.hpp
+++ b/include/mapnik/raster_colorizer.hpp
@@ -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
diff --git a/src/agg/process_raster_symbolizer.cpp b/src/agg/process_raster_symbolizer.cpp
index 35eb65d06..248109b57 100644
--- a/src/agg/process_raster_symbolizer.cpp
+++ b/src/agg/process_raster_symbolizer.cpp
@@ -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);