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
d5244eb6
Commit
d5244eb6
authored
Jun 16, 2014
by
Ilya Lavrenov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
invoking OCL before IPP
parent
45f21e4f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
6 deletions
+5
-6
morph.cpp
modules/imgproc/src/morph.cpp
+5
-6
No files found.
modules/imgproc/src/morph.cpp
View file @
d5244eb6
...
...
@@ -1468,11 +1468,6 @@ static void morphOp( int op, InputArray _src, OutputArray _dst,
Size
ksize
=
kernel
.
data
?
kernel
.
size
()
:
Size
(
3
,
3
);
anchor
=
normalizeAnchor
(
anchor
,
ksize
);
#if IPP_VERSION_X100 >= 801
if
(
IPPMorphOp
(
op
,
_src
,
_dst
,
kernel
,
anchor
,
iterations
,
borderType
,
borderValue
)
)
return
;
#endif
if
(
iterations
==
0
||
kernel
.
rows
*
kernel
.
cols
==
1
)
{
_src
.
copyTo
(
_dst
);
...
...
@@ -1501,8 +1496,12 @@ static void morphOp( int op, InputArray _src, OutputArray _dst,
(
op
==
MORPH_ERODE
||
op
==
MORPH_DILATE
),
ocl_morphology_op
(
_src
,
_dst
,
kernel
,
ksize
,
anchor
,
iterations
,
op
)
)
Mat
src
=
_src
.
getMat
();
#if IPP_VERSION_X100 >= 801
if
(
IPPMorphOp
(
op
,
_src
,
_dst
,
kernel
,
anchor
,
iterations
,
borderType
,
borderValue
)
)
return
;
#endif
Mat
src
=
_src
.
getMat
();
_dst
.
create
(
src
.
size
(),
src
.
type
()
);
Mat
dst
=
_dst
.
getMat
();
...
...
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