disable colorize-alpha comp-op as per #1371

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 <typename ColorT, typename Order>
     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<ColorT,Order>::blend_pix,
         comp_op_rgba_color<ColorT,Order>::blend_pix,
         comp_op_rgba_value<ColorT,Order>::blend_pix,
-        comp_op_rgba_colorize_alpha<ColorT,Order>::blend_pix,
+        //comp_op_rgba_colorize_alpha<ColorT,Order>::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
     };
 

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<composite_mode_e> comp_op_from_string(std::string const& name);

src/cairo_renderer.cpp

@@ -387,7 +387,7 @@ public:
         case saturation:
         case _color:
         case _value:
-        case colorize_alpha:
+        //case colorize_alpha:
             break;
         }
     }

src/image_compositing.cpp

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

tests/data/good_maps/colorize-alpha.xml

@@ -7,8 +7,11 @@
       <PolygonSymbolizer fill-opacity=".9" gamma=".65"/>
     </Rule>
   </Style>
-  
+
+<!--
   <Style name="style" comp-op="colorize-alpha">
+-->
+  <Style name="style">
     <Rule>
       <PointSymbolizer  file="../images/marker.png" allow-overlap="true"   />
     </Rule>