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
5084511f
Commit
5084511f
authored
Aug 08, 2012
by
marina.kolpakova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reserved flags parameter for future usage
parent
3e8c35a3
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
gpu.hpp
modules/gpu/include/opencv2/gpu/gpu.hpp
+1
-1
graphcuts.cpp
modules/gpu/src/graphcuts.cpp
+3
-3
No files found.
modules/gpu/include/opencv2/gpu/gpu.hpp
View file @
5084511f
...
...
@@ -921,7 +921,7 @@ CV_EXPORTS void graphcut(GpuMat& terminals, GpuMat& leftTransp, GpuMat& rightTra
CV_EXPORTS
void
connectivityMask
(
const
GpuMat
&
image
,
GpuMat
&
mask
,
const
cv
::
Scalar
&
lo
,
const
cv
::
Scalar
&
hi
,
Stream
&
stream
=
Stream
::
Null
());
//! performs connected componnents labeling.
CV_EXPORTS
void
labelComponents
(
const
GpuMat
&
mask
,
GpuMat
&
components
,
Stream
&
stream
=
Stream
::
Null
());
CV_EXPORTS
void
labelComponents
(
const
GpuMat
&
mask
,
GpuMat
&
components
,
int
flags
=
0
,
Stream
&
stream
=
Stream
::
Null
());
////////////////////////////////// Histograms //////////////////////////////////
...
...
modules/gpu/src/graphcuts.cpp
View file @
5084511f
...
...
@@ -48,7 +48,7 @@ void cv::gpu::graphcut(GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, Gpu
void
cv
::
gpu
::
graphcut
(
GpuMat
&
,
GpuMat
&
,
GpuMat
&
,
GpuMat
&
,
GpuMat
&
,
GpuMat
&
,
GpuMat
&
,
GpuMat
&
,
GpuMat
&
,
GpuMat
&
,
GpuMat
&
,
Stream
&
)
{
throw_nogpu
();
}
void
cv
::
gpu
::
connectivityMask
(
const
GpuMat
&
,
GpuMat
&
,
const
cv
::
Scalar
&
,
const
cv
::
Scalar
&
,
Stream
&
)
{
throw_nogpu
();
}
void
cv
::
gpu
::
labelComponents
(
const
GpuMat
&
mask
,
GpuMat
&
components
,
Stream
&
stream
)
{
throw_nogpu
();
}
void
cv
::
gpu
::
labelComponents
(
const
GpuMat
&
mask
,
GpuMat
&
components
,
int
,
Stream
&
stream
)
{
throw_nogpu
();
}
#else
/* !defined (HAVE_CUDA) */
...
...
@@ -106,7 +106,7 @@ void cv::gpu::connectivityMask(const GpuMat& image, GpuMat& mask, const cv::Scal
f
(
image
,
mask
,
culo
,
cuhi
,
stream
);
}
void
cv
::
gpu
::
labelComponents
(
const
GpuMat
&
mask
,
GpuMat
&
components
,
Stream
&
s
)
void
cv
::
gpu
::
labelComponents
(
const
GpuMat
&
mask
,
GpuMat
&
components
,
int
flags
,
Stream
&
s
)
{
CV_Assert
(
!
mask
.
empty
()
&&
mask
.
type
()
==
CV_8U
);
...
...
@@ -114,7 +114,7 @@ void cv::gpu::labelComponents(const GpuMat& mask, GpuMat& components, Stream& s)
components
.
create
(
mask
.
size
(),
CV_32SC1
);
cudaStream_t
stream
=
StreamAccessor
::
getStream
(
s
);
device
::
ccl
::
labelComponents
(
mask
,
components
,
0
,
stream
);
device
::
ccl
::
labelComponents
(
mask
,
components
,
flags
,
stream
);
}
namespace
...
...
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