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

Merge pull request #3722 from mapnik/fix_alpha_rgba_tiff_master

Browse source 
Use alpha over no data in RGBA tiffs
This commit is contained in:
Artem Pavlenko 2017-07-07 16:52:06 +02:00 committed by GitHub
commit 4ec9349389
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

@ -545,7 +545,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 99da07d5e76ccf5978ef0a380bf5f631f9088584 Subproject commit f95fe1c7b56a5eeb4fa2c2bcdc403d9254ce7448

2
test/data-visual

@ -1 +1 @@
Subproject commit 674c5402e6275905ddb7b1fccb0376cae2ec50e0 Subproject commit df578e3436681bb9bc582c7ac55a4205e98334f4