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

Fix crashes caused by aligned access to unaligned memory in CLUT code, fixes #3154, fixes #3278, fixes #3277

Browse Source
This commit is contained in:
heckflosse
2016-05-06 17:16:45 +02:00
parent 678315672b
commit 31b2589b9b
2 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtengine/clutstore.cc
View File

@@ -56,7 +56,7 @@ bool loadFile(
img_src.convertColorSpace(img_float.get(), icm, curr_wb);
}
AlignedBuffer<std::uint16_t> image(fw * fh * 4 + 4);
AlignedBuffer<std::uint16_t> image(fw * fh * 4 + 8); // + 8 because of SSE4_1 version of getClutValue
std::size_t index = 0;
@@ -81,9 +81,9 @@ bool loadFile(
vfloat getClutValue(const AlignedBuffer<std::uint16_t>& clut_image, size_t index)
{
#ifdef __SSE4_1__
return _mm_cvtepi32_ps(_mm_cvtepu16_epi32(*reinterpret_cast<const __m128i*>(clut_image.data + index)));
return _mm_cvtepi32_ps(_mm_cvtepu16_epi32(_mm_loadu_si128(reinterpret_cast<const __m128i*>(clut_image.data + index))));
#else
return _mm_cvtpu16_ps(*reinterpret_cast<const __m64*>(clut_image.data + index));
return _mm_set_ps(clut_image.data[index + 3], clut_image.data[index + 2], clut_image.data[index + 1], clut_image.data[index]);
#endif
}
#endif
@@ -205,8 +205,8 @@ void rtengine::HaldCLUT::getRGB(
out_rgbx[2] = intp<float>(strength, out_rgbx[2], *b);
#else
const vfloat v_in = _mm_set_ps(0.0f, *b, *g, *r);
const vfloat v_tmp = v_in * _mm_load_ps1(&flevel_minus_one);
const vfloat v_rgb = v_tmp - _mm_cvtepi32_ps(_mm_cvttps_epi32(_mm_min_ps(_mm_load_ps1(&flevel_minus_two), v_tmp)));
const vfloat v_tmp = v_in * F2V(flevel_minus_one);
const vfloat v_rgb = v_tmp - _mm_cvtepi32_ps(_mm_cvttps_epi32(_mm_min_ps(F2V(flevel_minus_two), v_tmp)));
size_t index = color * 4;