Use alpha in rgba of tiffs even if there is a no data value set. Fixes #3714

This commit is contained in:
Blake Thompson 2017-07-06 09:03:08 -05:00
parent 249d6cc311
commit 3c0a387af7
3 changed files with 3 additions and 3 deletions

View file

@ -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());

@ -1 +1 @@
Subproject commit cd681781c6efbfe9c83e365501d1cb44b8d6b366
Subproject commit da98ee10eb7ac8cd6d3b1441c3470dc5d3748c6e

@ -1 +1 @@
Subproject commit dd0c6261afb21d387df21890fd90f2915eea539d
Subproject commit 3da09cae02b1403d877aa9ff57df956e15ee3539