Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
56b7ddad
Commit
56b7ddad
authored
Aug 23, 2012
by
Vladislav Vinogradov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed type for threshold parameter
parent
8c1f9baf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
hough.cu
modules/gpu/src/cuda/hough.cu
+2
-2
hough.cpp
modules/gpu/src/hough.cpp
+1
-1
No files found.
modules/gpu/src/cuda/hough.cu
View file @
56b7ddad
...
...
@@ -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
floa
t threshold, const int numrho)
__global__ void linesGetResult(const DevMem2Di accum, float2* out, int* votes, const int maxSize, const float rho, const float theta, const
in
t 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,
floa
t threshold, bool doSort)
int linesGetResult_gpu(DevMem2Di accum, float2* out, int* votes, int maxSize, float rho, float theta,
in
t threshold, bool doSort)
{
void* counterPtr;
cudaSafeCall( cudaGetSymbolAddress(&counterPtr, g_counter) );
...
...
modules/gpu/src/hough.cpp
View file @
56b7ddad
...
...
@@ -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
,
floa
t
threshold
,
bool
doSort
);
int
linesGetResult_gpu
(
DevMem2Di
accum
,
float2
*
out
,
int
*
votes
,
int
maxSize
,
float
rho
,
float
theta
,
in
t
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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment