third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing intrin.hpp header in dis_flow.cpp.

Browse Source 
Fix #ifdef CV_SIMD128, should be #if CV_SIMD128.
This commit is contained in:
catree
2018-11-11 20:14:04 +01:00
parent 1913482cf5
commit c96850ba59
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/video/src/dis_flow.cpp
+9 -8
View File
@@ -41,6 +41,7 @@
//M*/
#include "precomp.hpp"
#include "opencv2/core/hal/intrin.hpp"
#include "opencl_kernels_video.hpp"
using namespace std;
@@ -517,7 +518,7 @@ inline float processPatch(float &dst_dUx, float &dst_dUy, uchar *I0_ptr, uchar *
int I0_stride, int I1_stride, float w00, float w01, float w10, float w11, int patch_sz)
{
float SSD = 0.0f;
#ifdef CV_SIMD128
#if CV_SIMD128
if (patch_sz == 8)
{
/* Variables to accumulate the sums */
@@ -569,7 +570,7 @@ inline float processPatch(float &dst_dUx, float &dst_dUy, uchar *I0_ptr, uchar *
dst_dUx += diff * I0x_ptr[i * I0_stride + j];
dst_dUy += diff * I0y_ptr[i * I0_stride + j];
}
#ifdef CV_SIMD128
#if CV_SIMD128
}
#endif
return SSD;
@@ -586,7 +587,7 @@ inline float processPatchMeanNorm(float &dst_dUx, float &dst_dUy, uchar *I0_ptr,
float sum_I0x_mul = 0.0, sum_I0y_mul = 0.0;
float n = (float)patch_sz * patch_sz;
#ifdef CV_SIMD128
#if CV_SIMD128
if (patch_sz == 8)
{
/* Variables to accumulate the sums */
@@ -641,7 +642,7 @@ inline float processPatchMeanNorm(float &dst_dUx, float &dst_dUy, uchar *I0_ptr,
sum_I0x_mul += diff * I0x_ptr[i * I0_stride + j];
sum_I0y_mul += diff * I0y_ptr[i * I0_stride + j];
}
#ifdef CV_SIMD128
#if CV_SIMD128
}
#endif
dst_dUx = sum_I0x_mul - sum_diff * x_grad_sum / n;
@@ -654,7 +655,7 @@ inline float computeSSD(uchar *I0_ptr, uchar *I1_ptr, int I0_stride, int I1_stri
float w11, int patch_sz)
{
float SSD = 0.0f;
#ifdef CV_SIMD128
#if CV_SIMD128
if (patch_sz == 8)
{
v_float32x4 SSD_vec = v_setall_f32(0);
@@ -679,7 +680,7 @@ inline float computeSSD(uchar *I0_ptr, uchar *I1_ptr, int I0_stride, int I1_stri
I0_ptr[i * I0_stride + j];
SSD += diff * diff;
}
#ifdef CV_SIMD128
#if CV_SIMD128
}
#endif
return SSD;
@@ -691,7 +692,7 @@ inline float computeSSDMeanNorm(uchar *I0_ptr, uchar *I1_ptr, int I0_stride, int
{
float sum_diff = 0.0f, sum_diff_sq = 0.0f;
float n = (float)patch_sz * patch_sz;
#ifdef CV_SIMD128
#if CV_SIMD128
if (patch_sz == 8)
{
v_float32x4 sum_diff_vec = v_setall_f32(0);
@@ -721,7 +722,7 @@ inline float computeSSDMeanNorm(uchar *I0_ptr, uchar *I1_ptr, int I0_stride, int
sum_diff += diff;
sum_diff_sq += diff * diff;
}
#ifdef CV_SIMD128
#if CV_SIMD128
}
#endif
return sum_diff_sq - sum_diff * sum_diff / n;