liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Solving issue 1776: "Support for TIFF files with alpha channel (RGBA)"

Browse Source
This commit is contained in:
natureh 510
2013-03-20 22:16:07 +01:00
parent ab22580efd
commit ea6b286325
1 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtengine/imageio.cc
View File

@@ -532,9 +532,8 @@ int ImageIO::getTIFFSampleFormat (Glib::ustring fname, IIOSampleFormat &sFormat,
TIFFClose(in); TIFFClose(in);
if (samplesperpixel==3) {
if (photometric == PHOTOMETRIC_RGB) { if (photometric == PHOTOMETRIC_RGB) {
if (sampleformat==SAMPLEFORMAT_UINT) { if ((samplesperpixel==3 || samplesperpixel==4) && sampleformat==SAMPLEFORMAT_UINT) {
if (bitspersample==8) { if (bitspersample==8) {
sFormat = IIOSF_UNSIGNED_CHAR; sFormat = IIOSF_UNSIGNED_CHAR;
return IMIO_SUCCESS; return IMIO_SUCCESS;
@@ -544,7 +543,7 @@ int ImageIO::getTIFFSampleFormat (Glib::ustring fname, IIOSampleFormat &sFormat,
return IMIO_SUCCESS; return IMIO_SUCCESS;
} }
} }
else if (sampleformat==SAMPLEFORMAT_IEEEFP) { else if (samplesperpixel==3 && sampleformat==SAMPLEFORMAT_IEEEFP) {
/* /*
* Not yet supported * Not yet supported
* *
@@ -552,13 +551,13 @@ int ImageIO::getTIFFSampleFormat (Glib::ustring fname, IIOSampleFormat &sFormat,
sFormat = IIOSF_HALF; sFormat = IIOSF_HALF;
return IMIO_SUCCESS; return IMIO_SUCCESS;
}*/ }*/
if (bitspersample==32) { if ((samplesperpixel==3 || samplesperpixel==4) && bitspersample==32) {
sFormat = IIOSF_FLOAT; sFormat = IIOSF_FLOAT;
return IMIO_SUCCESS; return IMIO_SUCCESS;
} }
} }
} }
else if (photometric == PHOTOMETRIC_LOGLUV) { else if (samplesperpixel==3 && photometric == PHOTOMETRIC_LOGLUV) {
if (compression==COMPRESSION_SGILOG24) { if (compression==COMPRESSION_SGILOG24) {
sFormat = IIOSF_LOGLUV24; sFormat = IIOSF_LOGLUV24;
return IMIO_SUCCESS; return IMIO_SUCCESS;
@@ -568,7 +567,6 @@ int ImageIO::getTIFFSampleFormat (Glib::ustring fname, IIOSampleFormat &sFormat,
return IMIO_SUCCESS; return IMIO_SUCCESS;
} }
} }
}
return IMIO_VARIANTNOTSUPPORTED; return IMIO_VARIANTNOTSUPPORTED;
} }