Updated tests and bindings to latest mapnik

Author: flippmoke

src/mapnik_image.cpp

@@ -282,14 +282,9 @@ void set_color_to_alpha(image_any & im, mapnik::color const& c)
     mapnik::set_color_to_alpha(im, c);
 }
 
-void set_alpha(image_any & im, float opacity)
+void apply_opacity(image_any & im, float opacity)
 {
-    mapnik::set_alpha(im, opacity);
-}
-
-void multiply_alpha(image_any & im, float opacity)
-{
-    mapnik::multiply_alpha(im, opacity);
+    mapnik::apply_opacity(im, opacity);
 }
 
 bool premultiplied(image_any &im)
@@ -410,8 +405,7 @@ void export_image()
         .def("set_grayscale_to_alpha",&set_grayscale_to_alpha, "Set the grayscale values to the alpha channel of the Image")
         .def("set_grayscale_to_alpha",&set_grayscale_to_alpha_c, "Set the grayscale values to the alpha channel of the Image")
         .def("set_color_to_alpha",&set_color_to_alpha, "Set a given color to the alpha channel of the Image")
-        .def("set_alpha",&set_alpha, "Set the overall alpha channel of the Image")
-        .def("multiply_alpha",&multiply_alpha, "Multiply the alpha channel of the Image")
+        .def("apply_opacity",&apply_opacity, "Set the opacity of the Image relative to the current alpha of each pixel.")
         .def("composite",&composite,
          ( arg("self"),
            arg("image"),

test/data

@@ -208,7 +208,7 @@ def test_rounding_and_color_expectations():
     # should have no effect
     im_file.premultiply()
     eq_(get_unique_colors(im_file),['rgba(0,0,0,0)', 'rgba(74,74,74,255)'])
-    im_file.multiply_alpha(.5)
+    im_file.apply_opacity(.5)
     # should have effect now that image has transparency
     im_file.premultiply()
     eq_(get_unique_colors(im_file),['rgba(0,0,0,0)', 'rgba(37,37,37,127)'])

test/data-visual

@@ -39,7 +39,7 @@ def test_add_geom_wkb():
 # POLYGON ((30 10, 10 20, 20 40, 40 40, 30 10))
     wkb = '010300000001000000050000000000000000003e4000000000000024400000000000002440000000000000344000000000000034400000000000004440000000000000444000000000000044400000000000003e400000000000002440'
     geometry = mapnik.Geometry.from_wkb(unhexlify(wkb))
-    eq_(geometry.is_valid(), False) # False because winding order is wrong according to OGC or because end point != first point
+    eq_(geometry.is_valid(), True)
     eq_(geometry.is_simple(), True)
     eq_(geometry.envelope(), mapnik.Box2d(10.0,10.0,40.0,40.0))
     geometry.correct()

test/python_tests/compositing_test.py

@@ -49,20 +49,10 @@ def test_image_premultiply_values():
     eq_(c.b,255)
     eq_(c.a,128)
 
-def test_set_alpha():
+def test_apply_opacity():
     im = mapnik.Image(4,4)
     im.fill(mapnik.Color(128,128,128,128))
-    im.set_alpha(0.75);
-    c = im.get_pixel(0,0,True)
-    eq_(c.r,128)
-    eq_(c.g,128)
-    eq_(c.b,128)
-    eq_(c.a,191)
-
-def test_multiply_alpha():
-    im = mapnik.Image(4,4)
-    im.fill(mapnik.Color(128,128,128,128))
-    im.multiply_alpha(0.75);
+    im.apply_opacity(0.75);
     c = im.get_pixel(0,0,True)
     eq_(c.r,128)
     eq_(c.g,128)