generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sqsum

Browse Source
This commit is contained in:
Ilya Lavrenov
2015-01-12 10:59:31 +03:00
parent 8c94568cc3
commit e9a6c5db21
7 changed files with 154 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/imgproc/src/color.cpp
View File

@@ -1598,10 +1598,10 @@ struct RGB2Gray<float>
haveSIMD = checkHardwareSupport(CV_CPU_SSE2);
}
void process(__m128 v_r, __m128 v_g, __m128 v_b,
void process(__m128 v_b, __m128 v_g, __m128 v_r,
__m128 & v_gray) const
{
v_gray = _mm_mul_ps(v_r, v_cb);
v_gray = _mm_mul_ps(v_r, v_cr);
v_gray = _mm_add_ps(v_gray, _mm_mul_ps(v_g, v_cg));
v_gray = _mm_add_ps(v_gray, _mm_mul_ps(v_b, v_cb));
}

4
modules/imgproc/src/imgwarp.cpp
View File

@@ -5016,8 +5016,8 @@ void cv::convertMaps( InputArray _map1, InputArray _map2,
vandq_s32(v_ix1, v_mask)));
vst1q_u16(dst2 + x, vcombine_u16(v_dst0, v_dst1));
}
#elif CV_SSE2
if (useSSE2)
#elif CV_SSE4_1
if (useSSE4_1)
{
__m128 v_its = _mm_set1_ps(INTER_TAB_SIZE);
__m128i v_its1 = _mm_set1_epi32(INTER_TAB_SIZE-1);

2
modules/imgproc/src/smooth.cpp
View File

@@ -842,7 +842,7 @@ struct ColumnSum<int, int> :
{
int32x4_t v_s0 = vaddq_s32(vld1q_s32(SUM + i), vld1q_s32(Sp + i));
vst1q_s32(D + i, v_s01);
vst1q_s32(D + i, v_s0);
vst1q_s32(SUM + i, vsubq_s32(v_s0, vld1q_s32(Sm + i)));
}
#endif