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

Softlight cleanups

Browse Source 
- More `const`
- Removed `using namespace`
- Whitespace cleanups
This commit is contained in:
Flössie 2019-09-12 14:49:51 +02:00
parent 2e34aa8a1d
commit 1e75f38dba
1 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
rtengine/ipsoftlight.cc
View File

@ -20,17 +20,17 @@
*/ */
#include "improcfun.h" #include "improcfun.h"
#include "procparams.h" #include "procparams.h"
#define BENCHMARK #define BENCHMARK
#include "StopWatch.h" #include "StopWatch.h"
namespace rtengine {
namespace { namespace {
inline float sl(float blend, float x) inline float sl(float blend, float x)
{ {
if (!OOG(x)) { if (!rtengine::OOG(x)) {
float v = Color::gamma_srgb(x) / MAXVALF; float v = rtengine::Color::gamma_srgb(x) / rtengine::MAXVALF;
// using Pegtop's formula from // using Pegtop's formula from
// https://en.wikipedia.org/wiki/Blend_modes#Soft_Light // https://en.wikipedia.org/wiki/Blend_modes#Soft_Light
// const float orig = 1.f - blend; // const float orig = 1.f - blend;
@ -40,7 +40,7 @@ inline float sl(float blend, float x)
// return blend * Color::igamma_srgb(v * MAXVALF) + orig * x; // return blend * Color::igamma_srgb(v * MAXVALF) + orig * x;
// using optimized formula (heckflosse67@gmx.de) // using optimized formula (heckflosse67@gmx.de)
return intp(blend, Color::igamma_srgb(v * v * (3.f - 2.f * v) * MAXVALF), x); return rtengine::intp(blend, rtengine::Color::igamma_srgb(v * v * (3.f - 2.f * v) * rtengine::MAXVALF), x);
} }
return x; return x;
} }
@ -48,51 +48,46 @@ inline float sl(float blend, float x)
#ifdef __SSE2__ #ifdef __SSE2__
inline vfloat sl(vfloat blend, vfloat x) inline vfloat sl(vfloat blend, vfloat x)
{ {
const vfloat v = Color::gammatab_srgb[x] / F2V(MAXVALF); const vfloat v = rtengine::Color::gammatab_srgb[x] / F2V(rtengine::MAXVALF);
return vself(vmaskf_gt(x, F2V(MAXVALF)), x, vself(vmaskf_lt(x, ZEROV), x, vintpf(blend, Color::igammatab_srgb[v * v * (F2V(3.f) - (v + v)) * MAXVALF], x))); return vself(vmaskf_gt(x, F2V(rtengine::MAXVALF)), x, vself(vmaskf_lt(x, ZEROV), x, vintpf(blend, rtengine::Color::igammatab_srgb[v * v * (F2V(3.f) - (v + v)) * rtengine::MAXVALF], x)));
} }
#endif #endif
} // namespace } // namespace
void rtengine::ImProcFunctions::softLight(LabImage *lab)
void ImProcFunctions::softLight(LabImage *lab)
{ {
if (!params->softlight.enabled || !params->softlight.strength) { if (!params->softlight.enabled || !params->softlight.strength) {
return; return;
} }
BENCHFUN BENCHFUN
TMatrix wprof = ICCStore::getInstance()->workingSpaceMatrix(params->icm.workingProfile); const TMatrix wprof = ICCStore::getInstance()->workingSpaceMatrix(params->icm.workingProfile);
const float wp[3][3] = { const float wp[3][3] = {
{static_cast<float> (wprof[0][0]), static_cast<float> (wprof[0][1]), static_cast<float> (wprof[0][2])}, {static_cast<float>(wprof[0][0]), static_cast<float>(wprof[0][1]), static_cast<float>(wprof[0][2])},
{static_cast<float> (wprof[1][0]), static_cast<float> (wprof[1][1]), static_cast<float> (wprof[1][2])}, {static_cast<float>(wprof[1][0]), static_cast<float>(wprof[1][1]), static_cast<float>(wprof[1][2])},
{static_cast<float> (wprof[2][0]), static_cast<float> (wprof[2][1]), static_cast<float> (wprof[2][2])} {static_cast<float>(wprof[2][0]), static_cast<float>(wprof[2][1]), static_cast<float>(wprof[2][2])}
}; };
TMatrix wiprof = ICCStore::getInstance()->workingSpaceInverseMatrix(params->icm.workingProfile); const TMatrix wiprof = ICCStore::getInstance()->workingSpaceInverseMatrix(params->icm.workingProfile);
const float wip[3][3] = { const float wip[3][3] = {
{static_cast<float> (wiprof[0][0]), static_cast<float> (wiprof[0][1]), static_cast<float> (wiprof[0][2])}, {static_cast<float>(wiprof[0][0]), static_cast<float>(wiprof[0][1]), static_cast<float>(wiprof[0][2])},
{static_cast<float> (wiprof[1][0]), static_cast<float> (wiprof[1][1]), static_cast<float> (wiprof[1][2])}, {static_cast<float>(wiprof[1][0]), static_cast<float>(wiprof[1][1]), static_cast<float>(wiprof[1][2])},
{static_cast<float> (wiprof[2][0]), static_cast<float> (wiprof[2][1]), static_cast<float> (wiprof[2][2])} {static_cast<float>(wiprof[2][0]), static_cast<float>(wiprof[2][1]), static_cast<float>(wiprof[2][2])}
}; };
#ifdef __SSE2__ #ifdef __SSE2__
vfloat wipv[3][3]; const vfloat wpv[3][3] = {
{F2V(wprof[0][0]), F2V(wprof[0][1]), F2V(wprof[0][2])},
{F2V(wprof[1][0]), F2V(wprof[1][1]), F2V(wprof[1][2])},
{F2V(wprof[2][0]), F2V(wprof[2][1]), F2V(wprof[2][2])}
};
for (int i = 0; i < 3; i++) { const vfloat wipv[3][3] = {
for (int j = 0; j < 3; j++) { {F2V(wiprof[0][0]), F2V(wiprof[0][1]), F2V(wiprof[0][2])},
wipv[i][j] = F2V(wiprof[i][j]); {F2V(wiprof[1][0]), F2V(wiprof[1][1]), F2V(wiprof[1][2])},
} {F2V(wiprof[2][0]), F2V(wiprof[2][1]), F2V(wiprof[2][2])}
} };
vfloat wpv[3][3];
for (int i = 0; i < 3; i++) {
for (int j = 0; j < 3; j++) {
wpv[i][j] = F2V(wprof[i][j]);
}
}
#endif #endif
#ifdef _OPENMP #ifdef _OPENMP
@ -137,5 +132,3 @@ void ImProcFunctions::softLight(LabImage *lab)
} }
} }
} }
} // namespace rtengine