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
d2b4ee1e
Commit
d2b4ee1e
authored
Apr 12, 2014
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More intendation fixes
parent
06df3836
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
16 deletions
+15
-16
bilateral.cl
modules/imgproc/src/opencl/bilateral.cl
+2
-2
smooth.cpp
modules/imgproc/src/smooth.cpp
+13
-14
No files found.
modules/imgproc/src/opencl/bilateral.cl
View file @
d2b4ee1e
...
...
@@ -77,7 +77,7 @@ __kernel void bilateral(__global const uchar * src, int src_step, int src_offset
int_t
val
=
convert_int_t
(
loadpix
(
src
+
src_index
+
space_ofs[k]
))
;
uint
diff
=
(
uint
)
SUM
(
abs
(
val
-
val0
))
;
float
w
=
space_weight[k]
*
native_exp
((
float
)(
diff
*
diff
*
as_float
(
gauss_color_coeff
)))
;
sum
+=
convert_float_t
(
val
)
*
(
float_t
)(
w
)
;
sum
+=
convert_float_t
(
val
)
*
(
float_t
)(
w
)
;
wsum
+=
w
;
}
...
...
@@ -107,7 +107,7 @@ __kernel void bilateral_float(__global const uchar * src, int src_step, int src_
float_t
val
=
convert_float_t
(
loadpix
(
src
+
src_index
+
space_ofs[k]
))
;
float
i
=
SUM
(
fabs
(
val
-
val0
))
;
float
w
=
space_weight[k]
*
native_exp
(
i
*
i
*
as_float
(
gauss_color_coeff
))
;
sum
+=
val
*
w
;
sum
+=
val
*
w
;
wsum
+=
w
;
}
storepix
(
convert_uchar_t
(
sum
/
(
float_t
)(
wsum
))
,
dst
+
dst_index
)
;
...
...
modules/imgproc/src/smooth.cpp
View file @
d2b4ee1e
...
...
@@ -2343,11 +2343,10 @@ static bool ocl_bilateralFilter_8u(InputArray _src, OutputArray _dst, int d,
copyMakeBorder
(
src
,
temp
,
radius
,
radius
,
radius
,
radius
,
borderType
);
std
::
vector
<
float
>
_space_weight
(
d
*
d
);
std
::
vector
<
int
>
_space_ofs
(
d
*
d
);
float
*
const
space_weight
=
&
_space_weight
[
0
];
int
*
const
space_ofs
=
&
_space_ofs
[
0
];
// initialize space-related bilateral filter coefficients
// initialize space-related bilateral filter coefficients
for
(
i
=
-
radius
,
maxk
=
0
;
i
<=
radius
;
i
++
)
for
(
j
=
-
radius
;
j
<=
radius
;
j
++
)
{
...
...
@@ -2358,13 +2357,13 @@ static bool ocl_bilateralFilter_8u(InputArray _src, OutputArray _dst, int d,
space_ofs
[
maxk
++
]
=
(
int
)(
i
*
temp
.
step
+
j
*
cn
);
}
char
cvt
[
3
][
40
];
String
cnstr
=
cn
>
1
?
format
(
"%d"
,
cn
)
:
""
;
String
kernelName
(
"bilateral"
);
size_t
sizeDiv
=
1
;
if
((
ocl
::
Device
::
getDefault
().
isIntel
())
&&
(
ocl
::
Device
::
getDefault
().
type
()
==
ocl
::
Device
::
TYPE_GPU
))
{
char
cvt
[
3
][
40
];
String
cnstr
=
cn
>
1
?
format
(
"%d"
,
cn
)
:
""
;
String
kernelName
(
"bilateral"
);
size_t
sizeDiv
=
1
;
if
((
ocl
::
Device
::
getDefault
().
isIntel
())
&&
(
ocl
::
Device
::
getDefault
().
type
()
==
ocl
::
Device
::
TYPE_GPU
))
{
//Intel GPU
if
(
dst
.
cols
%
4
==
0
&&
cn
==
1
)
// For single channel x4 sized images.
{
...
...
@@ -2376,12 +2375,12 @@ static bool ocl_bilateralFilter_8u(InputArray _src, OutputArray _dst, int d,
kernelName
=
"bilateral_float"
;
}
}
ocl
::
Kernel
k
(
kernelName
.
c_str
(),
ocl
::
imgproc
::
bilateral_oclsrc
,
format
(
"-D radius=%d -D maxk=%d -D cn=%d -D int_t=%s -D uint_t=uint%s -D convert_int_t=%s"
" -D uchar_t=%s -D float_t=%s -D convert_float_t=%s -D convert_uchar_t=%s -D gauss_color_coeff=%f"
,
radius
,
maxk
,
cn
,
ocl
::
typeToStr
(
CV_32SC
(
cn
)),
cnstr
.
c_str
(),
ocl
::
Kernel
k
(
kernelName
.
c_str
(),
ocl
::
imgproc
::
bilateral_oclsrc
,
format
(
"-D radius=%d -D maxk=%d -D cn=%d -D int_t=%s -D uint_t=uint%s -D convert_int_t=%s"
" -D uchar_t=%s -D float_t=%s -D convert_float_t=%s -D convert_uchar_t=%s -D gauss_color_coeff=%f"
,
radius
,
maxk
,
cn
,
ocl
::
typeToStr
(
CV_32SC
(
cn
)),
cnstr
.
c_str
(),
ocl
::
convertTypeStr
(
CV_8U
,
CV_32S
,
cn
,
cvt
[
0
]),
ocl
::
typeToStr
(
type
),
ocl
::
typeToStr
(
CV_32FC
(
cn
)),
ocl
::
typeToStr
(
type
),
ocl
::
typeToStr
(
CV_32FC
(
cn
)),
ocl
::
convertTypeStr
(
CV_32S
,
CV_32F
,
cn
,
cvt
[
1
]),
ocl
::
convertTypeStr
(
CV_32F
,
CV_8U
,
cn
,
cvt
[
2
]),
gauss_color_coeff
));
if
(
k
.
empty
())
...
...
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