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

fix wrong condition in Color::transitred

Browse Source
This commit is contained in:
heckflosse
2016-05-16 19:13:35 +02:00
parent 80f86c7189
commit 89a7ebac16
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rtengine/color.cc
View File

@@ -1844,21 +1844,13 @@ void Color::transitred (const float HH, float const Chprov1, const float dred, c
if(HH >= 0.15f && HH < 1.3f) {
if (Chprov1 < dred) {
factor = factorskin;
} else if(Chprov1 < (dred + protect_red))
// factor = (factorsat-factorskin)/protect_red*Chprov1+factorsat-(dred+protect_red)*(factorsat-factorskin)/protect_red;
// optimized formula
{
} else if(Chprov1 < (dred + protect_red)) {
factor = ((factorsat - factorskin) * Chprov1 + factorsat * protect_red - (dred + protect_red) * (factorsat - factorskin)) / protect_red;
}
}
// then test if chroma is in the extanded range
else if ( HH > (0.15f - deltaHH) || HH < (1.3f + deltaHH) ) {
} else if ( HH > (0.15f - deltaHH) && HH < (1.3f + deltaHH) ) { // test if chroma is in the extended range
if (Chprov1 < dred) {
factor = factorskinext; // C=dred=55 => real max of skin tones
} else if (Chprov1 < (dred + protect_red)) // transition
// factor = (factorsat-factorskinext)/protect_red*Chprov1+factorsat-(dred+protect_red)*(factorsat-factorskinext)/protect_red;
// optimized formula
{
} else if (Chprov1 < (dred + protect_red)) {// transition
factor = ((factorsat - factorskinext) * Chprov1 + factorsat * protect_red - (dred + protect_red) * (factorsat - factorskinext)) / protect_red;
}
}