Skip to content

O
opencv
Commit 3202062e authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #11005 from tomoaki0705:fixOclTestFailureVS2012

parents 09f0ecdf 9079d9ce
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 0 deletions
modules/imgproc/src/smooth.cpp
View file @ 3202062e
...@@ -4674,11 +4674,17 @@ public: ...@@ -4674,11 +4674,17 @@ public:
color_weight[buf[2]], color_weight[buf[2]],
color_weight[buf[3]]); color_weight[buf[3]]);
v_float32x4 _sw = v_load(space_weight+k); v_float32x4 _sw = v_load(space_weight+k);
#if defined(_MSC_VER) && _MSC_VER == 1700/* MSVS 2012 */ && CV_AVX
// details: https://github.com/opencv/opencv/issues/11004
vsumw += _cw * _sw;
vsumc += _cw * _sw * _valF;
#else
v_float32x4 _w = _cw * _sw; v_float32x4 _w = _cw * _sw;
_cw = _w * _valF; _cw = _w * _valF;
vsumw += _w; vsumw += _w;
vsumc += _cw; vsumc += _cw;
#endif
} }
float *bufFloat = (float*)buf; float *bufFloat = (float*)buf;
v_float32x4 sum4 = v_reduce_sum4(vsumw, vsumc, vsumw, vsumc); v_float32x4 sum4 = v_reduce_sum4(vsumw, vsumc, vsumw, vsumc);
...@@ -4743,6 +4749,13 @@ public: ...@@ -4743,6 +4749,13 @@ public:
color_weight[buf[2]],color_weight[buf[3]]); color_weight[buf[2]],color_weight[buf[3]]);
v_float32x4 _sw = v_load(space_weight+k); v_float32x4 _sw = v_load(space_weight+k);
#if defined(_MSC_VER) && _MSC_VER == 1700/* MSVS 2012 */ && CV_AVX
// details: https://github.com/opencv/opencv/issues/11004
vsumw += _w * _sw;
vsumb += _w * _sw * _b;
vsumg += _w * _sw * _g;
vsumr += _w * _sw * _r;
#else
_w *= _sw; _w *= _sw;
_b *= _w; _b *= _w;
_g *= _w; _g *= _w;
...@@ -4752,6 +4765,7 @@ public: ...@@ -4752,6 +4765,7 @@ public:
vsumb += _b; vsumb += _b;
vsumg += _g; vsumg += _g;
vsumr += _r; vsumr += _r;
#endif
} }
float *bufFloat = (float*)buf; float *bufFloat = (float*)buf;
v_float32x4 sum4 = v_reduce_sum4(vsumw, vsumb, vsumg, vsumr); v_float32x4 sum4 = v_reduce_sum4(vsumw, vsumb, vsumg, vsumr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment