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

Merge pull request #3276 from Floessie/fix-haldclut-overrun

Browse Source 
Fix buffer overrun when applying HaldCLUT (#3154)
This commit is contained in:
Ingo Weyrich 2016-05-04 20:30:37 +02:00
commit 678315672b
1 changed files with 43 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
rtengine/improcfun.cc
View File

@ -4354,39 +4354,37 @@ void ImProcFunctions::rgbProc (Imagefloat* working, LabImage* lab, PipetteBuffer
if (hald_clut) { if (hald_clut) {
float out_rgbx[4 * TS] ALIGNED16; float out_rgbx[4 * TS] ALIGNED16;
for (int i = istart, ti = 0; i < tH; i++, ti++) { for (int i = istart, ti = 0; i < tH; i++, ti++) {
if (!clutAndWorkingProfilesAreSame) { if (!clutAndWorkingProfilesAreSame) {
// Convert from working to clut profile // Convert from working to clut profile
int j = jstart;
int tj = 0;
#ifdef __SSE2__ #ifdef __SSE2__
if (!(std::min(TS, tW - jstart) & ~3)) { for (; j < tW - 3; j += 4, tj += 4) {
for (int j = jstart, tj = 0; j < tW; j += 4, tj += 4) { vfloat sourceR = LVF(rtemp[ti * TS + tj]);
vfloat sourceR = LVF(rtemp[ti * TS + tj]); vfloat sourceG = LVF(gtemp[ti * TS + tj]);
vfloat sourceG = LVF(gtemp[ti * TS + tj]); vfloat sourceB = LVF(btemp[ti * TS + tj]);
vfloat sourceB = LVF(btemp[ti * TS + tj]);
vfloat x; vfloat x;
vfloat y; vfloat y;
vfloat z; vfloat z;
Color::rgbxyz(sourceR, sourceG, sourceB, x, y, z, v_work2xyz); Color::rgbxyz(sourceR, sourceG, sourceB, x, y, z, v_work2xyz);
Color::xyz2rgb(x, y, z, sourceR, sourceG, sourceB, v_xyz2clut); Color::xyz2rgb(x, y, z, sourceR, sourceG, sourceB, v_xyz2clut);
STVF(rtemp[ti * TS + tj], sourceR); STVF(rtemp[ti * TS + tj], sourceR);
STVF(gtemp[ti * TS + tj], sourceG); STVF(gtemp[ti * TS + tj], sourceG);
STVF(btemp[ti * TS + tj], sourceB); STVF(btemp[ti * TS + tj], sourceB);
}
} }
else
#endif #endif
{ for (; j < tW; j++, tj++) {
for (int j = jstart, tj = 0; j < tW; j++, tj++) { float &sourceR = rtemp[ti * TS + tj];
float &sourceR = rtemp[ti * TS + tj]; float &sourceG = gtemp[ti * TS + tj];
float &sourceG = gtemp[ti * TS + tj]; float &sourceB = btemp[ti * TS + tj];
float &sourceB = btemp[ti * TS + tj];
float x, y, z; float x, y, z;
Color::rgbxyz(sourceR, sourceG, sourceB, x, y, z, work2xyz); Color::rgbxyz(sourceR, sourceG, sourceB, x, y, z, work2xyz);
Color::xyz2rgb(x, y, z, sourceR, sourceG, sourceB, xyz2clut); Color::xyz2rgb(x, y, z, sourceR, sourceG, sourceB, xyz2clut);
}
} }
} }
@ -4424,36 +4422,33 @@ void ImProcFunctions::rgbProc (Imagefloat* working, LabImage* lab, PipetteBuffer
if (!clutAndWorkingProfilesAreSame) { if (!clutAndWorkingProfilesAreSame) {
// Convert from clut to working profile // Convert from clut to working profile
int j = jstart;
int tj = 0;
#ifdef __SSE2__ #ifdef __SSE2__
if (!(std::min(TS, tW - jstart) & ~3)) { for (; j < tW - 3; j += 4, tj += 4) {
for (int j = jstart, tj = 0; j < tW; j += 4, tj += 4) { vfloat sourceR = LVF(rtemp[ti * TS + tj]);
vfloat sourceR = LVF(rtemp[ti * TS + tj]); vfloat sourceG = LVF(gtemp[ti * TS + tj]);
vfloat sourceG = LVF(gtemp[ti * TS + tj]); vfloat sourceB = LVF(btemp[ti * TS + tj]);
vfloat sourceB = LVF(btemp[ti * TS + tj]);
vfloat x; vfloat x;
vfloat y; vfloat y;
vfloat z; vfloat z;
Color::rgbxyz(sourceR, sourceG, sourceB, x, y, z, v_clut2xyz); Color::rgbxyz(sourceR, sourceG, sourceB, x, y, z, v_clut2xyz);
Color::xyz2rgb(x, y, z, sourceR, sourceG, sourceB, v_xyz2work); Color::xyz2rgb(x, y, z, sourceR, sourceG, sourceB, v_xyz2work);
STVF(rtemp[ti * TS + tj], sourceR); STVF(rtemp[ti * TS + tj], sourceR);
STVF(gtemp[ti * TS + tj], sourceG); STVF(gtemp[ti * TS + tj], sourceG);
STVF(btemp[ti * TS + tj], sourceB); STVF(btemp[ti * TS + tj], sourceB);
}
} }
else
#endif #endif
{ for (; j < tW; j++, tj++) {
for (int j = jstart, tj = 0; j < tW; j++, tj++) { float &sourceR = rtemp[ti * TS + tj];
float &sourceR = rtemp[ti * TS + tj]; float &sourceG = gtemp[ti * TS + tj];
float &sourceG = gtemp[ti * TS + tj]; float &sourceB = btemp[ti * TS + tj];
float &sourceB = btemp[ti * TS + tj];
float x, y, z; float x, y, z;
Color::rgbxyz(sourceR, sourceG, sourceB, x, y, z, clut2xyz); Color::rgbxyz(sourceR, sourceG, sourceB, x, y, z, clut2xyz);
Color::xyz2rgb(x, y, z, sourceR, sourceG, sourceB, xyz2work); Color::xyz2rgb(x, y, z, sourceR, sourceG, sourceB, xyz2work);
}
} }
} }
} }