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

fixed type for threshold parameter

Browse Source
This commit is contained in:
Vladislav Vinogradov 2012-08-23 17:06:38 +04:00
parent 8c1f9bafdc
commit 56b7ddad09
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gpu/src/cuda/hough.cu
View File

@ -226,7 +226,7 @@ namespace cv { namespace gpu { namespace device
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// linesGetResult // linesGetResult
__global__ void linesGetResult(const DevMem2Di accum, float2* out, int* votes, const int maxSize, const float rho, const float theta, const float threshold, const int numrho) __global__ void linesGetResult(const DevMem2Di accum, float2* out, int* votes, const int maxSize, const float rho, const float theta, const int threshold, const int numrho)
{ {
const int r = blockIdx.x * blockDim.x + threadIdx.x; const int r = blockIdx.x * blockDim.x + threadIdx.x;
const int n = blockIdx.y * blockDim.y + threadIdx.y; const int n = blockIdx.y * blockDim.y + threadIdx.y;
@ -254,7 +254,7 @@ namespace cv { namespace gpu { namespace device
} }
} }
int linesGetResult_gpu(DevMem2Di accum, float2* out, int* votes, int maxSize, float rho, float theta, float threshold, bool doSort) int linesGetResult_gpu(DevMem2Di accum, float2* out, int* votes, int maxSize, float rho, float theta, int threshold, bool doSort)
{ {
void* counterPtr; void* counterPtr;
cudaSafeCall( cudaGetSymbolAddress(&counterPtr, g_counter) ); cudaSafeCall( cudaGetSymbolAddress(&counterPtr, g_counter) );

2
modules/gpu/src/hough.cpp
View File

@ -61,7 +61,7 @@ namespace cv { namespace gpu { namespace device
int buildPointList_gpu(DevMem2Db src, unsigned int* list); int buildPointList_gpu(DevMem2Db src, unsigned int* list);
void linesAccum_gpu(const unsigned int* list, int count, DevMem2Di accum, float rho, float theta, size_t sharedMemPerBlock, bool has20); void linesAccum_gpu(const unsigned int* list, int count, DevMem2Di accum, float rho, float theta, size_t sharedMemPerBlock, bool has20);
int linesGetResult_gpu(DevMem2Di accum, float2* out, int* votes, int maxSize, float rho, float theta, float threshold, bool doSort); int linesGetResult_gpu(DevMem2Di accum, float2* out, int* votes, int maxSize, float rho, float theta, int threshold, bool doSort);
void circlesAccumCenters_gpu(const unsigned int* list, int count, PtrStepi dx, PtrStepi dy, DevMem2Di accum, int minRadius, int maxRadius, float idp); void circlesAccumCenters_gpu(const unsigned int* list, int count, PtrStepi dx, PtrStepi dy, DevMem2Di accum, int minRadius, int maxRadius, float idp);
int buildCentersList_gpu(DevMem2Di accum, unsigned int* centers, int threshold); int buildCentersList_gpu(DevMem2Di accum, unsigned int* centers, int threshold);