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

make scalar and SSE versions of minEigenVal & cornerHarris give [almost] the same results (ticket #811)

Browse Source
This commit is contained in:
Vadim Pisarevsky
2011-06-01 13:45:08 +00:00
parent f2f8fc14b0
commit 8191b5564f
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/imgproc/src/corner.cpp
View File

@@ -95,9 +95,9 @@ calcMinEigenVal( const Mat& _cov, Mat& _dst )
#endif #endif
for( ; j < size.width; j++ ) for( ; j < size.width; j++ )
{ {
double a = cov[j*3]*0.5; float a = cov[j*3]*0.5f;
double b = cov[j*3+1]; float b = cov[j*3+1];
double c = cov[j*3+2]*0.5; float c = cov[j*3+2]*0.5f;
dst[j] = (float)((a + c) - std::sqrt((a - c)*(a - c) + b*b)); dst[j] = (float)((a + c) - std::sqrt((a - c)*(a - c) + b*b));
} }
} }
@@ -144,7 +144,7 @@ calcHarris( const Mat& _cov, Mat& _dst, double k )
b = _mm_movehl_ps(b, t); b = _mm_movehl_ps(b, t);
t = _mm_add_ps(a, c); t = _mm_add_ps(a, c);
a = _mm_sub_ps(_mm_mul_ps(a, c), _mm_mul_ps(b, b)); a = _mm_sub_ps(_mm_mul_ps(a, c), _mm_mul_ps(b, b));
t = _mm_mul_ps(_mm_mul_ps(t, t), k4); t = _mm_mul_ps(_mm_mul_ps(k4, t), t);
a = _mm_sub_ps(a, t); a = _mm_sub_ps(a, t);
_mm_storeu_ps(dst + j, a); _mm_storeu_ps(dst + j, a);
} }
@@ -153,9 +153,9 @@ calcHarris( const Mat& _cov, Mat& _dst, double k )
for( ; j < size.width; j++ ) for( ; j < size.width; j++ )
{ {
double a = cov[j*3]; float a = cov[j*3];
double b = cov[j*3+1]; float b = cov[j*3+1];
double c = cov[j*3+2]; float c = cov[j*3+2];
dst[j] = (float)(a*c - b*b - k*(a + c)*(a + c)); dst[j] = (float)(a*c - b*b - k*(a + c)*(a + c));
} }
} }
@@ -362,8 +362,8 @@ void cv::preCornerDetect( const InputArray& _src, OutputArray _dst, int ksize, i
for( j = 0; j < size.width; j++ ) for( j = 0; j < size.width; j++ )
{ {
double dx = dxdata[j]; float dx = dxdata[j];
double dy = dydata[j]; float dy = dydata[j];
dstdata[j] = (float)(factor*(dx*dx*d2ydata[j] + dy*dy*d2xdata[j] - 2*dx*dy*dxydata[j])); dstdata[j] = (float)(factor*(dx*dx*d2ydata[j] + dy*dy*d2xdata[j] - 2*dx*dy*dxydata[j]));
} }
} }