From 56b7ddad0909b7dd78ba132c5b07c283bfdd6a2a Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Thu, 23 Aug 2012 17:06:38 +0400 Subject: [PATCH] fixed type for threshold parameter --- modules/gpu/src/cuda/hough.cu | 4 ++-- modules/gpu/src/hough.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/gpu/src/cuda/hough.cu b/modules/gpu/src/cuda/hough.cu index 63099d3bcc..b4cb14776d 100644 --- a/modules/gpu/src/cuda/hough.cu +++ b/modules/gpu/src/cuda/hough.cu @@ -226,7 +226,7 @@ namespace cv { namespace gpu { namespace device //////////////////////////////////////////////////////////////////////// // 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 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; cudaSafeCall( cudaGetSymbolAddress(&counterPtr, g_counter) ); diff --git a/modules/gpu/src/hough.cpp b/modules/gpu/src/hough.cpp index 82396e3fc6..57f60468ee 100644 --- a/modules/gpu/src/hough.cpp +++ b/modules/gpu/src/hough.cpp @@ -61,7 +61,7 @@ namespace cv { namespace gpu { namespace device 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); - 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); int buildCentersList_gpu(DevMem2Di accum, unsigned int* centers, int threshold);