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

cv::cvtColor

Browse Source
This commit is contained in:
Ilya Lavrenov 2014-10-05 09:48:31 -07:00
parent 6f05a250be
commit a54f6bb08b
3 changed files with 1358 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/imgproc/perf/perf_blur.cpp
View File

@ -98,6 +98,11 @@ PERF_TEST_P(Size_MatType_BorderType, blur16x16,
Size size = get<0>(GetParam()); Size size = get<0>(GetParam());
int type = get<1>(GetParam()); int type = get<1>(GetParam());
BorderType btype = get<2>(GetParam()); BorderType btype = get<2>(GetParam());
double eps = 1e-3;
#if CV_NEON
eps = CV_MAT_DEPTH(type) <= CV_32S ? 1 : eps;
#endif
Mat src(size, type); Mat src(size, type);
Mat dst(size, type); Mat dst(size, type);
@ -106,7 +111,7 @@ PERF_TEST_P(Size_MatType_BorderType, blur16x16,
TEST_CYCLE() blur(src, dst, Size(16,16), Point(-1,-1), btype); TEST_CYCLE() blur(src, dst, Size(16,16), Point(-1,-1), btype);
SANITY_CHECK(dst, 1e-3); SANITY_CHECK(dst, eps);
} }
PERF_TEST_P(Size_MatType_BorderType3x3, box3x3, PERF_TEST_P(Size_MatType_BorderType3x3, box3x3,

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

File diff suppressed because it is too large Load Diff

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

@ -3580,14 +3580,6 @@ public:
_mm_storeu_si128((__m128i*)(XY + x1*2 + 8), iy1); _mm_storeu_si128((__m128i*)(XY + x1*2 + 8), iy1);
} }
} }
#elif CV_NEON
for( ; x1 <= bcols - 4; x1 += 4 )
{
int32x4_t v_sx = cv_vrndq_s32_f32(vld1q_f32(sX + x1)),
v_sy = cv_vrndq_s32_f32(vld1q_f32(sY + x1));
int16x4x2_t v_dst = vzip_s16(vqmovn_s32(v_sx), vqmovn_s32(v_sy));
vst1q_s16(XY + (x1 << 1), vcombine_s16(v_dst.val[0], v_dst.val[1]));
}
#endif #endif
for( ; x1 < bcols; x1++ ) for( ; x1 < bcols; x1++ )