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
8fe4e98b
Commit
8fe4e98b
authored
Dec 16, 2013
by
Elena Gvozdeva
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed trailing whitespace
parent
b2d8b491
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
17 deletions
+15
-17
medianFilter.cl
modules/imgproc/src/opencl/medianFilter.cl
+6
-6
smooth.cpp
modules/imgproc/src/smooth.cpp
+9
-11
No files found.
modules/imgproc/src/opencl/medianFilter.cl
View file @
8fe4e98b
...
...
@@ -46,7 +46,7 @@ __kernel void medianFilter3(__global const uchar* srcptr, int srcStep, int srcOf
int
gx=
get_global_id
(
0
)
;
int
gy=
get_global_id
(
1
)
;
int
dx
=
gx
-
x
-
1
;
int
dy
=
gy
-
y
-
1
;
...
...
@@ -59,7 +59,7 @@ __kernel void medianFilter3(__global const uchar* srcptr, int srcStep, int srcOf
int
r
=
clamp
(
dy+dr,
0
,
rows-1
)
;
int
index1
=
mad24
(
r,
srcStep,
srcOffset
+
c*scnbytes
)
;
r
=
clamp
(
dy+dr+9,
0
,
rows-1
)
;
int
index9
=
mad24
(
r,
srcStep,
srcOffset
+
c*scnbytes
)
;
...
...
@@ -110,15 +110,15 @@ __kernel void medianFilter5(__global const uchar* srcptr, int srcStep, int srcOf
int
dr=id/20
;
int
dc=id%20
;
int
c=clamp
(
dx+dc,
0
,
cols-1
)
;
int
r
=
clamp
(
dy+dr,
0
,
rows-1
)
;
int
index1
=
mad24
(
r,
srcStep,
srcOffset
+
c*scnbytes
)
;
r
=
clamp
(
dy+dr+10,
0
,
rows-1
)
;
int
index10
=
mad24
(
r,
srcStep,
srcOffset
+
c*scnbytes
)
;
__global
DATA_TYPE
*
src
=
(
__global
DATA_TYPE
*
)(
srcptr
+
index1
)
;
data[dr][dc]
=
src[0]
;
src
=
(
__global
DATA_TYPE
*
)(
srcptr
+
index10
)
;
...
...
@@ -158,7 +158,7 @@ __kernel void medianFilter5(__global const uchar* srcptr, int srcStep, int srcOf
op
(
p7,
p11
)
; op(p11, p13); op(p11, p12);
int
dst_index
=
mad24
(
gy,
dstStep,
dstOffset
+
gx
*
scnbytes
)
;
if
(
gy
<
rows
&&
gx
<
cols
)
{
__global
DATA_TYPE*
dst
=
(
__global
DATA_TYPE
*
)(
dstptr
+
dst_index
)
;
...
...
modules/imgproc/src/smooth.cpp
View file @
8fe4e98b
...
...
@@ -1667,12 +1667,12 @@ namespace cv
{
int
type
=
_src
.
type
();
int
depth
=
CV_MAT_DEPTH
(
type
),
cn
=
CV_MAT_CN
(
type
);
if
(
!
((
depth
==
CV_8U
||
depth
==
CV_16U
||
depth
==
CV_16S
||
depth
==
CV_32F
)
&&
(
cn
==
1
||
cn
==
4
)))
return
false
;
const
char
*
kernelName
;
if
(
m
==
3
)
kernelName
=
"medianFilter3"
;
else
if
(
m
==
5
)
...
...
@@ -1683,7 +1683,7 @@ namespace cv
ocl
::
Kernel
k
(
kernelName
,
ocl
::
imgproc
::
medianFilter_oclsrc
,
format
(
"-D type=%s"
,
ocl
::
typeToStr
(
type
)));
if
(
k
.
empty
())
return
false
;
_dst
.
create
(
_src
.
size
(),
type
);
UMat
src
=
_src
.
getUMat
(),
dst
=
_dst
.
getUMat
();
...
...
@@ -1699,20 +1699,18 @@ void cv::medianBlur( InputArray _src0, OutputArray _dst, int ksize )
CV_Assert
(
ksize
%
2
==
1
);
if
(
ksize
<=
1
)
{
{
Mat
src0
=
_src0
.
getMat
();
_dst
.
create
(
src0
.
size
(),
src0
.
type
()
);
Mat
dst
=
_dst
.
getMat
();
src0
.
copyTo
(
dst
);
return
;
}
bool
use_opencl
=
ocl
::
useOpenCL
()
&&
_dst
.
isUMat
();
// if ( use_opencl && ocl_medianFilter(_src0,_dst, ksize))
if
(
use_opencl
)
{
CV_Assert
(
ocl_medianFilter
(
_src0
,
_dst
,
ksize
));
return
;}
if
(
use_opencl
&&
ocl_medianFilter
(
_src0
,
_dst
,
ksize
))
return
;
Mat
src0
=
_src0
.
getMat
();
_dst
.
create
(
src0
.
size
(),
src0
.
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