generic-library/webp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "tiffdec: fix EXTRASAMPLES check"

Browse Source
This commit is contained in:
James Zern 2017-04-27 17:39:33 +00:00 committed by Gerrit Code Review
commit a9c701e04f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
imageio/tiffdec.c
View File

@ -215,7 +215,8 @@ int ReadTIFF(const uint8_t* const data, size_t data_size,
TIFFSwabArrayOfLong(raster, width * height);
#endif
// if we have an alpha channel, we must un-multiply from rgbA to RGBA
if (samples_per_px > 3 && extra_samples == 1) {
if (extra_samples == 1 && extra_samples_ptr != NULL &&
extra_samples_ptr[0] == EXTRASAMPLE_ASSOCALPHA) {
uint32_t y;
uint8_t* tmp = (uint8_t*)raster;
for (y = 0; y < height; ++y) {