mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-12 20:42:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12526 from terfendail:avx2_resize_fix

Browse Source
This commit is contained in:
Alexander Alekhin 2018-09-14 15:57:47 +00:00
commit 92ec971453
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/imgproc/src/resize.cpp
View File

@ -531,7 +531,6 @@ void hlineResizeCn<uint8_t, ufixedpoint16, 2, true, 1>(uint8_t* src, int, int *o
{ {
v_store((uint16_t*)dst, v_src_0); v_store((uint16_t*)dst, v_src_0);
} }
vx_cleanup();
#endif #endif
for (; i < dst_width; i++) for (; i < dst_width; i++)
{ {
@ -588,7 +587,6 @@ void hlineResizeCn<uint8_t, ufixedpoint16, 2, true, 2>(uint8_t* src, int, int *o
{ {
v_store((uint16_t*)dst, v_srccn); v_store((uint16_t*)dst, v_srccn);
} }
vx_cleanup();
#endif #endif
for (; i < dst_width; i++) for (; i < dst_width; i++)
{ {
@ -661,7 +659,6 @@ void hlineResizeCn<uint8_t, ufixedpoint16, 2, true, 4>(uint8_t* src, int, int *o
{ {
v_store((uint16_t*)dst, v_srccn); v_store((uint16_t*)dst, v_srccn);
} }
vx_cleanup();
#endif #endif
if (i < dst_width) if (i < dst_width)
{ {
@ -710,7 +707,6 @@ void hlineResizeCn<uint16_t, ufixedpoint32, 2, true, 1>(uint16_t* src, int, int
{ {
v_store((uint32_t*)dst, v_src_0); v_store((uint32_t*)dst, v_src_0);
} }
vx_cleanup();
#endif #endif
for (; i < dst_width; i++) for (; i < dst_width; i++)
{ {
@ -741,7 +737,6 @@ void vlineSet<uint8_t, ufixedpoint16>(ufixedpoint16* src, uint8_t* dst, int dst_
v_store(dst, v_pack(v_res0, v_res1)); v_store(dst, v_pack(v_res0, v_res1));
} }
vx_cleanup();
#endif #endif
for (; i < dst_width; i++) for (; i < dst_width; i++)
*(dst++) = *(src++); *(dst++) = *(src++);
@ -793,7 +788,6 @@ void vlineResize<uint8_t, ufixedpoint16, 2>(ufixedpoint16* src, size_t src_step,
v_store(dst, v_reinterpret_as_u8(v_sub_wrap(v_res, v_128_16))); v_store(dst, v_reinterpret_as_u8(v_sub_wrap(v_res, v_128_16)));
} }
vx_cleanup();
#endif #endif
for (; i < dst_width; i++) for (; i < dst_width; i++)
{ {
@ -899,6 +893,9 @@ public:
hResize((ET*)(src + (src_height - 1) * src_step), cn, xoffsets, xcoeffs, endline, min_x, max_x, dst_width); hResize((ET*)(src + (src_height - 1) * src_step), cn, xoffsets, xcoeffs, endline, min_x, max_x, dst_width);
for (; dy < range.end; dy++) for (; dy < range.end; dy++)
vlineSet<ET, FT>(endline, (ET*)(dst + dst_step * dy), dst_width*cn); vlineSet<ET, FT>(endline, (ET*)(dst + dst_step * dy), dst_width*cn);
#if CV_SIMD
vx_cleanup();
#endif
} }
private: private: