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
528ddb56
Commit
528ddb56
authored
Aug 15, 2012
by
Vladislav Vinogradov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed block size for old CC
parent
65f85856
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
hough.cu
modules/gpu/src/cuda/hough.cu
+2
-2
hough.cpp
modules/gpu/src/hough.cpp
+2
-2
No files found.
modules/gpu/src/cuda/hough.cu
View file @
528ddb56
...
...
@@ -203,9 +203,9 @@ namespace cv { namespace gpu { namespace device
accum(n + 1, i) = smem[i];
}
void linesAccum_gpu(const unsigned int* list, int count, DevMem2Di accum, float rho, float theta, size_t sharedMemPerBlock)
void linesAccum_gpu(const unsigned int* list, int count, DevMem2Di accum, float rho, float theta, size_t sharedMemPerBlock
, bool has20
)
{
const dim3 block(
1024
);
const dim3 block(
has20 ? 1024 : 512
);
const dim3 grid(accum.rows - 2);
cudaSafeCall( cudaFuncSetCacheConfig(linesAccumShared, cudaFuncCachePreferShared) );
...
...
modules/gpu/src/hough.cpp
View file @
528ddb56
...
...
@@ -57,7 +57,7 @@ namespace cv { namespace gpu { namespace device
namespace
hough
{
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
);
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
);
}
}}}
...
...
@@ -85,7 +85,7 @@ void cv::gpu::HoughLinesTransform(const GpuMat& src, GpuMat& accum, GpuMat& buf,
cv
::
gpu
::
DeviceInfo
devInfo
;
if
(
count
>
0
)
linesAccum_gpu
(
buf
.
ptr
<
unsigned
int
>
(),
count
,
accum
,
rho
,
theta
,
devInfo
.
sharedMemPerBlock
());
linesAccum_gpu
(
buf
.
ptr
<
unsigned
int
>
(),
count
,
accum
,
rho
,
theta
,
devInfo
.
sharedMemPerBlock
()
,
devInfo
.
supports
(
cv
::
gpu
::
FEATURE_SET_COMPUTE_20
)
);
}
void
cv
::
gpu
::
HoughLinesGet
(
const
GpuMat
&
accum
,
GpuMat
&
lines
,
float
rho
,
float
theta
,
int
threshold
,
bool
doSort
,
int
maxLines
)
...
...
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