From 951f10791a1f2e05fcf8f657fe88a35e2c3f8f62 Mon Sep 17 00:00:00 2001
From: Blake Thompson <flippmoke@gmail.com>
Date: Thu, 6 Jul 2017 12:30:05 -0500
Subject: [PATCH] Fix for #3714 in master, addresses RGBA tiffs that have an
 alpha value and no data value - and are using the no data value over the
 alpha.

---
 plugins/input/gdal/gdal_featureset.cpp | 2 +-
 test/data                              | 2 +-
 test/data-visual                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/input/gdal/gdal_featureset.cpp b/plugins/input/gdal/gdal_featureset.cpp
index 02f2dd745..979f9e587 100644
--- a/plugins/input/gdal/gdal_featureset.cpp
+++ b/plugins/input/gdal/gdal_featureset.cpp
@@ -545,7 +545,7 @@ feature_ptr gdal_featureset::get_feature(mapnik::query const& q)
             if (alpha)
             {
                 MAPNIK_LOG_DEBUG(gdal) << "gdal_featureset: processing alpha band...";
-                if (!raster_has_nodata)
+                if (!raster_has_nodata || (red && green && blue))
                 {
                     raster_io_error = alpha->RasterIO(GF_Read, x_off, y_off, width, height, image.bytes() + 3,
                                                       image.width(), image.height(), GDT_Byte, 4, 4 * image.width());
diff --git a/test/data b/test/data
index 99da07d5e..f95fe1c7b 160000
--- a/test/data
+++ b/test/data
@@ -1 +1 @@
-Subproject commit 99da07d5e76ccf5978ef0a380bf5f631f9088584
+Subproject commit f95fe1c7b56a5eeb4fa2c2bcdc403d9254ce7448
diff --git a/test/data-visual b/test/data-visual
index 674c5402e..df578e343 160000
--- a/test/data-visual
+++ b/test/data-visual
@@ -1 +1 @@
-Subproject commit 674c5402e6275905ddb7b1fccb0376cae2ec50e0
+Subproject commit df578e3436681bb9bc582c7ac55a4205e98334f4