Merge branch 'master' into webp_more_tests

benchmark/test_png_encoding2.cpp

@@ -3,7 +3,7 @@
 
 class test : public benchmark::test_case
 {
-    std::shared_ptr<image_rgba8> im_;
+    std::shared_ptr<mapnik::image_rgba8> im_;
 public:
     test(mapnik::parameters const& params)
      : test_case(params) {
@@ -13,7 +13,7 @@ public:
         {
             throw mapnik::image_reader_exception("Failed to load: " + filename);
         }
-        im_ = std::make_shared<image_rgba8>(reader->width(),reader->height());
+        im_ = std::make_shared<mapnik::image_rgba8>(reader->width(),reader->height());
         reader->read(0,0,*im_);
     }
     bool validate() const

src/agg/agg_renderer.cpp

@@ -250,9 +250,7 @@ void agg_renderer<T0,T1>::end_layer_processing(layer const& lyr)
     {
         composite_mode_e comp_op = lyr.comp_op() ? *lyr.comp_op() : src_over;
         composite(previous_buffer, current_buffer,
-                  comp_op, lyr.get_opacity(),
-                  -common_.t_.offset(),
-                  -common_.t_.offset());
+                  comp_op, lyr.get_opacity(), 0, 0);
         internal_buffers_.pop();
     }
 }

test/data-visual

@@ -1 +1 @@
-Subproject commit 07f60172b0dbb70d261b520c499a8dd8daabe5a7
+Subproject commit 0ca64e7760dfd6b1573b7a8c65ede3521a5ea5c3