sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3721 from mapnik/tiff_alpha_rgba_fix

Browse source 
Use alpha in rgba of tiffs even if there is a no data value set.
This commit is contained in:
Artem Pavlenko 2017-07-17 09:25:35 +02:00 committed by GitHub
commit f06147b454
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/input/gdal/gdal_featureset.cpp
View file

@ -547,7 +547,7 @@ feature_ptr gdal_featureset::get_feature(mapnik::query const& q)
if (alpha) if (alpha)
{ {
MAPNIK_LOG_DEBUG(gdal) << "gdal_featureset: processing alpha band..."; 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, 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()); image.width(), image.height(), GDT_Byte, 4, 4 * image.width());

2
test/data

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

2
test/data-visual

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