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

Merge branch 'dev' into testoutputprofile

Browse Source
This commit is contained in:
Morgan Hardwood
2018-05-17 12:00:05 +02:00
parent 84827c6038 58f99f1df1
commit f753bf7b66
67 changed files with 831 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtengine/stdimagesource.cc
View File

@@ -128,7 +128,9 @@ int StdImageSource::load (const Glib::ustring &fname)
case (IIOSF_LOGLUV24):
case (IIOSF_LOGLUV32):
case (IIOSF_FLOAT): {
case (IIOSF_FLOAT16):
case (IIOSF_FLOAT24):
case (IIOSF_FLOAT32): {
img = new Imagefloat;
break;
}
@@ -224,7 +226,7 @@ void StdImageSource::colorSpaceConversion (Imagefloat* im, const ColorManagement
if (embedded) {
in = embedded;
} else {
if (sampleFormat & (IIOSF_LOGLUV24 | IIOSF_LOGLUV32 | IIOSF_FLOAT)) {
if (sampleFormat & (IIOSF_LOGLUV24 | IIOSF_LOGLUV32 | IIOSF_FLOAT16 | IIOSF_FLOAT24 | IIOSF_FLOAT32)) {
skipTransform = true;
} else {
in = ICCStore::getInstance()->getsRGBProfile ();
@@ -237,7 +239,7 @@ void StdImageSource::colorSpaceConversion (Imagefloat* im, const ColorManagement
if (in == nullptr && embedded) {
in = embedded;
} else if (in == nullptr) {
if (sampleFormat & (IIOSF_LOGLUV24 | IIOSF_LOGLUV32 | IIOSF_FLOAT)) {
if (sampleFormat & (IIOSF_LOGLUV24 | IIOSF_LOGLUV32 | IIOSF_FLOAT16 | IIOSF_FLOAT24 | IIOSF_FLOAT32)) {
skipTransform = true;
} else {
in = ICCStore::getInstance()->getsRGBProfile ();