From 3c0a387af7795478b98f6143162d5a64b6599aae Mon Sep 17 00:00:00 2001
From: Blake Thompson <flippmoke@gmail.com>
Date: Thu, 6 Jul 2017 09:03:08 -0500
Subject: [PATCH] Use alpha in rgba of tiffs even if there is a no data value
 set. Fixes #3714

---
 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 8f755fdda..661f8e141 100644
--- a/plugins/input/gdal/gdal_featureset.cpp
+++ b/plugins/input/gdal/gdal_featureset.cpp
@@ -547,7 +547,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 cd681781c..da98ee10e 160000
--- a/test/data
+++ b/test/data
@@ -1 +1 @@
-Subproject commit cd681781c6efbfe9c83e365501d1cb44b8d6b366
+Subproject commit da98ee10eb7ac8cd6d3b1441c3470dc5d3748c6e
diff --git a/test/data-visual b/test/data-visual
index dd0c6261a..3da09cae0 160000
--- a/test/data-visual
+++ b/test/data-visual
@@ -1 +1 @@
-Subproject commit dd0c6261afb21d387df21890fd90f2915eea539d
+Subproject commit 3da09cae02b1403d877aa9ff57df956e15ee3539