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

Fix non-SSE2 build (fixes #4284)

Browse Source
This commit is contained in:
Flössie
2018-01-08 17:51:31 +01:00
parent 529a7f3003
commit 5104368c4a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rtengine/improcfun.cc
View File

@@ -2170,7 +2170,9 @@ void ImProcFunctions::ciecam_02float (CieImage* ncie, float adap, int pW, int pw
const float pow1 = pow_F ( 1.64f - pow_F ( 0.29f, n ), 0.73f ); const float pow1 = pow_F ( 1.64f - pow_F ( 0.29f, n ), 0.73f );
float nj, nbbj, ncbj, czj, awj, flj; float nj, nbbj, ncbj, czj, awj, flj;
Ciecam02::initcam2float (gamu, yb2, pilotout, f2, la2, xw2, yw2, zw2, nj, dj, nbbj, ncbj, czj, awj, flj); Ciecam02::initcam2float (gamu, yb2, pilotout, f2, la2, xw2, yw2, zw2, nj, dj, nbbj, ncbj, czj, awj, flj);
#ifdef __SSE2__
const float reccmcz = 1.f / (c2 * czj); const float reccmcz = 1.f / (c2 * czj);
#endif
const float pow1n = pow_F ( 1.64f - pow_F ( 0.29f, nj ), 0.73f ); const float pow1n = pow_F ( 1.64f - pow_F ( 0.29f, nj ), 0.73f );
const float epsil = 0.0001f; const float epsil = 0.0001f;
@@ -2735,7 +2737,7 @@ void ImProcFunctions::ciecam_02float (CieImage* ncie, float adap, int pW, int pw
Ciecam02::jch2xyz_ciecam02float ( xx, yy, zz, Ciecam02::jch2xyz_ciecam02float ( xx, yy, zz,
J, C, h, J, C, h,
xw2, yw2, zw2, xw2, yw2, zw2,
f2, c2, nc2, gamu, pow1n, nbbj, ncbj, flj, czj, dj, awj); c2, nc2, gamu, pow1n, nbbj, ncbj, flj, czj, dj, awj);
float x, y, z; float x, y, z;
x = xx * 655.35f; x = xx * 655.35f;
y = yy * 655.35f; y = yy * 655.35f;
@@ -2746,10 +2748,9 @@ void ImProcFunctions::ciecam_02float (CieImage* ncie, float adap, int pW, int pw
// gamut control in Lab mode; I must study how to do with cIECAM only // gamut control in Lab mode; I must study how to do with cIECAM only
if (gamu == 1) { if (gamu == 1) {
float HH, Lprov1, Chprov1; float Lprov1, Chprov1;
Lprov1 = Ll / 327.68f; Lprov1 = Ll / 327.68f;
Chprov1 = sqrtf (SQR (aa) + SQR (bb)) / 327.68f; Chprov1 = sqrtf (SQR (aa) + SQR (bb)) / 327.68f;
HH = xatan2f (bb, aa);
float2 sincosval; float2 sincosval;
if (Chprov1 == 0.0f) { if (Chprov1 == 0.0f) {
@@ -3079,7 +3080,7 @@ void ImProcFunctions::ciecam_02float (CieImage* ncie, float adap, int pW, int pw
Ciecam02::jch2xyz_ciecam02float ( xx, yy, zz, Ciecam02::jch2xyz_ciecam02float ( xx, yy, zz,
ncie->J_p[i][j], ncie_C_p, ncie->h_p[i][j], ncie->J_p[i][j], ncie_C_p, ncie->h_p[i][j],
xw2, yw2, zw2, xw2, yw2, zw2,
f2, c2, nc2, gamu, pow1n, nbbj, ncbj, flj, czj, dj, awj); c2, nc2, gamu, pow1n, nbbj, ncbj, flj, czj, dj, awj);
float x = (float)xx * 655.35f; float x = (float)xx * 655.35f;
float y = (float)yy * 655.35f; float y = (float)yy * 655.35f;
float z = (float)zz * 655.35f; float z = (float)zz * 655.35f;