From a734ff1e905d72a870bc736e2e6521fedd3e4adc Mon Sep 17 00:00:00 2001
From: Jiri Drbalek <jiri.drbalek@firma.seznam.cz>
Date: Fri, 2 Jun 2017 14:27:20 +0000
Subject: [PATCH 1/3] layers should be composited with zero offset

---
 src/agg/agg_renderer.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/agg/agg_renderer.cpp b/src/agg/agg_renderer.cpp
index b20e119f1..f6624f83f 100644
--- a/src/agg/agg_renderer.cpp
+++ b/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();
     }
 }

From 0ecc4c6762a5e2eab54523ce55329e8b171eb6fb Mon Sep 17 00:00:00 2001
From: Jiri Drbalek <jiri.drbalek@firma.seznam.cz>
Date: Fri, 2 Jun 2017 15:43:11 +0000
Subject: [PATCH 2/3] update visual tests

---
 test/data-visual | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/data-visual b/test/data-visual
index 85a94e315..0ca64e776 160000
--- a/test/data-visual
+++ b/test/data-visual
@@ -1 +1 @@
-Subproject commit 85a94e315d0c2d4b3c7248ee9a7fc0197cac2002
+Subproject commit 0ca64e7760dfd6b1573b7a8c65ede3521a5ea5c3

From 309b34a01193f2cd64d48e28453c58a01e6d02ba Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 5 Jun 2017 15:52:49 +0200
Subject: [PATCH 3/3] fix - add missing namespace qualifier.

---
 benchmark/test_png_encoding2.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/benchmark/test_png_encoding2.cpp b/benchmark/test_png_encoding2.cpp
index 910a9ac95..9b415e0b6 100644
--- a/benchmark/test_png_encoding2.cpp
+++ b/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