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
bd889400
Commit
bd889400
authored
Jul 30, 2014
by
vbystricky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some problems
parent
878dec65
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
morph.cpp
modules/imgproc/src/morph.cpp
+10
-10
No files found.
modules/imgproc/src/morph.cpp
View file @
bd889400
...
@@ -1352,6 +1352,9 @@ static bool ocl_morphSmall( InputArray _src, OutputArray _dst, InputArray _kerne
...
@@ -1352,6 +1352,9 @@ static bool ocl_morphSmall( InputArray _src, OutputArray _dst, InputArray _kerne
_src
.
offset
()
%
esz
!=
0
||
_src
.
step
()
%
esz
!=
0
)
_src
.
offset
()
%
esz
!=
0
||
_src
.
step
()
%
esz
!=
0
)
return
false
;
return
false
;
bool
haveExtraMat
=
!
_extraMat
.
empty
();
CV_Assert
(
actual_op
<=
3
||
haveExtraMat
);
Size
ksize
=
_kernel
.
size
();
Size
ksize
=
_kernel
.
size
();
if
(
anchor
.
x
<
0
)
if
(
anchor
.
x
<
0
)
anchor
.
x
=
ksize
.
width
/
2
;
anchor
.
x
=
ksize
.
width
/
2
;
...
@@ -1369,9 +1372,6 @@ static bool ocl_morphSmall( InputArray _src, OutputArray _dst, InputArray _kerne
...
@@ -1369,9 +1372,6 @@ static bool ocl_morphSmall( InputArray _src, OutputArray _dst, InputArray _kerne
}
}
char
cvt
[
2
][
40
];
char
cvt
[
2
][
40
];
bool
haveExtraMat
=
!
_extraMat
.
empty
();
CV_Assert
(
actual_op
<=
3
||
haveExtraMat
);
const
char
*
const
borderMap
[]
=
{
"BORDER_CONSTANT"
,
"BORDER_REPLICATE"
,
const
char
*
const
borderMap
[]
=
{
"BORDER_CONSTANT"
,
"BORDER_REPLICATE"
,
"BORDER_REFLECT"
,
0
,
"BORDER_REFLECT_101"
};
"BORDER_REFLECT"
,
0
,
"BORDER_REFLECT_101"
};
size_t
globalsize
[
2
]
=
{
size
.
width
,
size
.
height
};
size_t
globalsize
[
2
]
=
{
size
.
width
,
size
.
height
};
...
@@ -1506,6 +1506,13 @@ static bool ocl_morphOp(InputArray _src, OutputArray _dst, InputArray _kernel,
...
@@ -1506,6 +1506,13 @@ static bool ocl_morphOp(InputArray _src, OutputArray _dst, InputArray _kernel,
Mat
kernel
=
_kernel
.
getMat
();
Mat
kernel
=
_kernel
.
getMat
();
Size
ksize
=
kernel
.
data
?
kernel
.
size
()
:
Size
(
3
,
3
),
ssize
=
_src
.
size
();
Size
ksize
=
kernel
.
data
?
kernel
.
size
()
:
Size
(
3
,
3
),
ssize
=
_src
.
size
();
bool
doubleSupport
=
dev
.
doubleFPConfig
()
>
0
;
if
((
depth
==
CV_64F
&&
!
doubleSupport
)
||
borderType
!=
BORDER_CONSTANT
)
return
false
;
bool
haveExtraMat
=
!
_extraMat
.
empty
();
CV_Assert
(
actual_op
<=
3
||
haveExtraMat
);
// try to use OpenCL kernel adopted for small morph kernel
// try to use OpenCL kernel adopted for small morph kernel
if
(
dev
.
isIntel
()
&&
!
(
dev
.
type
()
&
ocl
::
Device
::
TYPE_CPU
)
&&
if
(
dev
.
isIntel
()
&&
!
(
dev
.
type
()
&
ocl
::
Device
::
TYPE_CPU
)
&&
((
ksize
.
width
<
5
&&
ksize
.
height
<
5
&&
esz
<=
4
)
||
((
ksize
.
width
<
5
&&
ksize
.
height
<
5
&&
esz
<=
4
)
||
...
@@ -1516,13 +1523,6 @@ static bool ocl_morphOp(InputArray _src, OutputArray _dst, InputArray _kernel,
...
@@ -1516,13 +1523,6 @@ static bool ocl_morphOp(InputArray _src, OutputArray _dst, InputArray _kernel,
return
true
;
return
true
;
}
}
bool
doubleSupport
=
dev
.
doubleFPConfig
()
>
0
;
if
((
depth
==
CV_64F
&&
!
doubleSupport
)
||
borderType
!=
BORDER_CONSTANT
)
return
false
;
bool
haveExtraMat
=
!
_extraMat
.
empty
();
CV_Assert
(
actual_op
<=
3
||
haveExtraMat
);
if
(
iterations
==
0
||
kernel
.
rows
*
kernel
.
cols
==
1
)
if
(
iterations
==
0
||
kernel
.
rows
*
kernel
.
cols
==
1
)
{
{
_src
.
copyTo
(
_dst
);
_src
.
copyTo
(
_dst
);
...
...
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