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

Merge pull request from pengx17:2.4_fix_corner_detector

Browse Source
This commit is contained in:
Vadim Pisarevsky 2013-06-07 13:44:10 +04:00 committed by OpenCV Buildbot
commit 51f81eec36
3 changed files with 18 additions and 15 deletions

15
modules/ocl/src/opencl/imgproc_calcHarris.cl

@ -130,28 +130,29 @@ __kernel void calcHarris(__global const float *Dx,__global const float *Dy, __gl
data[2][i] = dy_data[i] * dy_data[i]; data[2][i] = dy_data[i] * dy_data[i];
} }
#else #else
for(int i=0; i < ksY+1; i++) int clamped_col = min(dst_cols, col);
{ for(int i=0; i < ksY+1; i++)
{
int dx_selected_row; int dx_selected_row;
int dx_selected_col; int dx_selected_col;
dx_selected_row = ADDR_H(dx_startY+i, 0, dx_whole_rows); dx_selected_row = ADDR_H(dx_startY+i, 0, dx_whole_rows);
dx_selected_row = ADDR_B(dx_startY+i, dx_whole_rows, dx_selected_row); dx_selected_row = ADDR_B(dx_startY+i, dx_whole_rows, dx_selected_row);
dx_selected_col = ADDR_L(dx_startX+col, 0, dx_whole_cols); dx_selected_col = ADDR_L(dx_startX+clamped_col, 0, dx_whole_cols);
dx_selected_col = ADDR_R(dx_startX+col, dx_whole_cols, dx_selected_col); dx_selected_col = ADDR_R(dx_startX+clamped_col, dx_whole_cols, dx_selected_col);
dx_data[i] = Dx[dx_selected_row * (dx_step>>2) + dx_selected_col]; dx_data[i] = Dx[dx_selected_row * (dx_step>>2) + dx_selected_col];
int dy_selected_row; int dy_selected_row;
int dy_selected_col; int dy_selected_col;
dy_selected_row = ADDR_H(dy_startY+i, 0, dy_whole_rows); dy_selected_row = ADDR_H(dy_startY+i, 0, dy_whole_rows);
dy_selected_row = ADDR_B(dy_startY+i, dy_whole_rows, dy_selected_row); dy_selected_row = ADDR_B(dy_startY+i, dy_whole_rows, dy_selected_row);
dy_selected_col = ADDR_L(dy_startX+col, 0, dy_whole_cols); dy_selected_col = ADDR_L(dy_startX+clamped_col, 0, dy_whole_cols);
dy_selected_col = ADDR_R(dy_startX+col, dy_whole_cols, dy_selected_col); dy_selected_col = ADDR_R(dy_startX+clamped_col, dy_whole_cols, dy_selected_col);
dy_data[i] = Dy[dy_selected_row * (dy_step>>2) + dy_selected_col]; dy_data[i] = Dy[dy_selected_row * (dy_step>>2) + dy_selected_col];
data[0][i] = dx_data[i] * dx_data[i]; data[0][i] = dx_data[i] * dx_data[i];
data[1][i] = dx_data[i] * dy_data[i]; data[1][i] = dx_data[i] * dy_data[i];
data[2][i] = dy_data[i] * dy_data[i]; data[2][i] = dy_data[i] * dy_data[i];
} }
#endif #endif
float sum0 = 0.0, sum1 = 0.0, sum2 = 0.0; float sum0 = 0.0, sum1 = 0.0, sum2 = 0.0;
for(int i=1; i < ksY; i++) for(int i=1; i < ksY; i++)

16
modules/ocl/src/opencl/imgproc_calcMinEigenVal.cl

@ -130,28 +130,30 @@ __kernel void calcMinEigenVal(__global const float *Dx,__global const float *Dy,
data[2][i] = dy_data[i] * dy_data[i]; data[2][i] = dy_data[i] * dy_data[i];
} }
#else #else
for(int i=0; i < ksY+1; i++) int clamped_col = min(dst_cols, col);
{
for(int i=0; i < ksY+1; i++)
{
int dx_selected_row; int dx_selected_row;
int dx_selected_col; int dx_selected_col;
dx_selected_row = ADDR_H(dx_startY+i, 0, dx_whole_rows); dx_selected_row = ADDR_H(dx_startY+i, 0, dx_whole_rows);
dx_selected_row = ADDR_B(dx_startY+i, dx_whole_rows, dx_selected_row); dx_selected_row = ADDR_B(dx_startY+i, dx_whole_rows, dx_selected_row);
dx_selected_col = ADDR_L(dx_startX+col, 0, dx_whole_cols); dx_selected_col = ADDR_L(dx_startX+clamped_col, 0, dx_whole_cols);
dx_selected_col = ADDR_R(dx_startX+col, dx_whole_cols, dx_selected_col); dx_selected_col = ADDR_R(dx_startX+clamped_col, dx_whole_cols, dx_selected_col);
dx_data[i] = Dx[dx_selected_row * (dx_step>>2) + dx_selected_col]; dx_data[i] = Dx[dx_selected_row * (dx_step>>2) + dx_selected_col];
int dy_selected_row; int dy_selected_row;
int dy_selected_col; int dy_selected_col;
dy_selected_row = ADDR_H(dy_startY+i, 0, dy_whole_rows); dy_selected_row = ADDR_H(dy_startY+i, 0, dy_whole_rows);
dy_selected_row = ADDR_B(dy_startY+i, dy_whole_rows, dy_selected_row); dy_selected_row = ADDR_B(dy_startY+i, dy_whole_rows, dy_selected_row);
dy_selected_col = ADDR_L(dy_startX+col, 0, dy_whole_cols); dy_selected_col = ADDR_L(dy_startX+clamped_col, 0, dy_whole_cols);
dy_selected_col = ADDR_R(dy_startX+col, dy_whole_cols, dy_selected_col); dy_selected_col = ADDR_R(dy_startX+clamped_col, dy_whole_cols, dy_selected_col);
dy_data[i] = Dy[dy_selected_row * (dy_step>>2) + dy_selected_col]; dy_data[i] = Dy[dy_selected_row * (dy_step>>2) + dy_selected_col];
data[0][i] = dx_data[i] * dx_data[i]; data[0][i] = dx_data[i] * dx_data[i];
data[1][i] = dx_data[i] * dy_data[i]; data[1][i] = dx_data[i] * dy_data[i];
data[2][i] = dy_data[i] * dy_data[i]; data[2][i] = dy_data[i] * dy_data[i];
} }
#endif #endif
float sum0 = 0.0, sum1 = 0.0, sum2 = 0.0; float sum0 = 0.0, sum1 = 0.0, sum2 = 0.0;
for(int i=1; i < ksY; i++) for(int i=1; i < ksY; i++)

2
modules/ocl/test/test_optflow.cpp

@ -121,7 +121,7 @@ TEST_P(GoodFeaturesToTrack, EmptyCorners)
cv::ocl::GoodFeaturesToTrackDetector_OCL detector(maxCorners, qualityLevel, minDistance); cv::ocl::GoodFeaturesToTrackDetector_OCL detector(maxCorners, qualityLevel, minDistance);
cv::ocl::oclMat src(100, 128, CV_8UC1, cv::Scalar::all(0)); cv::ocl::oclMat src(100, 100, CV_8UC1, cv::Scalar::all(0));
cv::ocl::oclMat corners(1, maxCorners, CV_32FC2); cv::ocl::oclMat corners(1, maxCorners, CV_32FC2);
detector(src, corners); detector(src, corners);