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

merge with Dev..

Browse Source
This commit is contained in:
Desmis 2018-04-03 12:25:24 +02:00
commit e4d7b278ee
6 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
rtdata/dcpprofiles/Canon EOS 600D.dcp Normal file
View File

Binary file not shown.

BIN
rtdata/dcpprofiles/Canon EOS 6D.dcp
View File

Binary file not shown.

BIN
rtdata/dcpprofiles/Canon EOS Kiss X5.dcp Normal file
View File

Binary file not shown.

BIN
rtdata/dcpprofiles/Canon EOS Rebel T3i.dcp Normal file
View File

Binary file not shown.

BIN
rtdata/dcpprofiles/FUJIFILM FinePix F600EXR.dcp Normal file
View File

Binary file not shown.

9
rtengine/improcfun.cc
View File

@ -3782,13 +3782,12 @@ void ImProcFunctions::rgbProc(Imagefloat* working, LabImage* lab, PipetteBuffer
float g = std::max(gtemp[ti * TS + tj], 0.f); float g = std::max(gtemp[ti * TS + tj], 0.f);
float b = std::max(btemp[ti * TS + tj], 0.f); float b = std::max(btemp[ti * TS + tj], 0.f);
if (r > 65535 || g > 65535 || b > 65535) { if (max(r, g, b) > MAXVALF && min(r, g, b) < MAXVALF) {
filmlike_clip(&r, &g, &b); filmlike_clip(&r, &g, &b);
} }
rtemp[ti * TS + tj] = r;
setUnlessOOG(rtemp[ti * TS + tj], r); gtemp[ti * TS + tj] = g;
setUnlessOOG(gtemp[ti * TS + tj], g); btemp[ti * TS + tj] = b;
setUnlessOOG(btemp[ti * TS + tj], b);
} }
} }