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

fixed bug in SURF_GPU

Browse Source
This commit is contained in:
Vladislav Vinogradov 2012-01-30 07:59:14 +00:00
parent d38ca09738
commit bb23288c3d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/gpu/src/cuda/surf.cu
View File

@ -504,8 +504,6 @@ namespace cv { namespace gpu { namespace device
__global__ void icvCalcOrientation(const float* featureX, const float* featureY, const float* featureSize, float* featureDir) __global__ void icvCalcOrientation(const float* featureX, const float* featureY, const float* featureSize, float* featureDir)
{ {
#if defined (__CUDA_ARCH__) && __CUDA_ARCH__ >= 110
__shared__ float s_X[128]; __shared__ float s_X[128];
__shared__ float s_Y[128]; __shared__ float s_Y[128];
__shared__ float s_angle[128]; __shared__ float s_angle[128];
@ -597,6 +595,8 @@ namespace cv { namespace gpu { namespace device
bestx = sumx; bestx = sumx;
besty = sumy; besty = sumy;
} }
__syncthreads();
} }
if (threadIdx.x == 0) if (threadIdx.x == 0)
@ -642,8 +642,6 @@ namespace cv { namespace gpu { namespace device
featureDir[blockIdx.x] = kp_dir; featureDir[blockIdx.x] = kp_dir;
} }
} }
#endif
} }
#undef ORI_SEARCH_INC #undef ORI_SEARCH_INC

4
modules/gpu/src/surf.cpp
View File

@ -200,7 +200,9 @@ namespace
keypoints.cols = featureCounter; keypoints.cols = featureCounter;
if (!upright) if (upright)
keypoints.row(SURF_GPU::SF_DIR).setTo(Scalar::all(90.0));
else
findOrientation(keypoints); findOrientation(keypoints);
} }