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
059e6e43
Commit
059e6e43
authored
Jan 22, 2014
by
Ilya Lavrenov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed cv::sepFilter2D
parent
ee331001
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
7 deletions
+3
-7
filter.cpp
modules/imgproc/src/filter.cpp
+3
-7
No files found.
modules/imgproc/src/filter.cpp
View file @
059e6e43
...
...
@@ -3510,8 +3510,8 @@ static bool ocl_sepFilter2D( InputArray _src, OutputArray _dst, int ddepth,
return
false
;
int
type
=
_src
.
type
();
if
(
(
CV_8UC1
!=
type
)
&&
(
CV_8U
C4
==
type
)
&&
(
CV_32FC1
!=
type
)
&&
(
CV_32FC4
==
type
)
)
if
(
!
(
(
CV_8UC1
==
type
||
CV_8UC4
==
type
||
CV_32FC1
==
type
||
CV_32F
C4
==
type
)
&&
(
ddepth
==
CV_32F
||
ddepth
==
CV_8U
)
)
)
return
false
;
int
cn
=
CV_MAT_CN
(
type
);
...
...
@@ -3531,8 +3531,6 @@ static bool ocl_sepFilter2D( InputArray _src, OutputArray _dst, int ddepth,
if
(
ddepth
<
0
)
ddepth
=
sdepth
;
else
if
(
ddepth
!=
sdepth
)
return
false
;
UMat
src
=
_src
.
getUMat
();
Size
srcWholeSize
;
Point
srcOffset
;
...
...
@@ -3541,9 +3539,7 @@ static bool ocl_sepFilter2D( InputArray _src, OutputArray _dst, int ddepth,
(
0
!=
(
src
.
cols
%
4
))
||
(
0
!=
((
src
.
step
/
src
.
elemSize
())
%
4
))
)
{
return
false
;
}
Size
srcSize
=
src
.
size
();
Size
bufSize
(
srcSize
.
width
,
srcSize
.
height
+
kernelY
.
cols
-
1
);
...
...
@@ -3723,7 +3719,7 @@ void cv::sepFilter2D( InputArray _src, OutputArray _dst, int ddepth,
double
delta
,
int
borderType
)
{
bool
use_opencl
=
ocl
::
useOpenCL
()
&&
_dst
.
isUMat
();
if
(
use_opencl
&&
ocl_sepFilter2D
(
_src
,
_dst
,
ddepth
,
_kernelX
,
_kernelY
,
anchor
,
delta
,
borderType
))
if
(
use_opencl
&&
ocl_sepFilter2D
(
_src
,
_dst
,
ddepth
,
_kernelX
,
_kernelY
,
anchor
,
delta
,
borderType
))
return
;
Mat
src
=
_src
.
getMat
(),
kernelX
=
_kernelX
.
getMat
(),
kernelY
=
_kernelY
.
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