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
606df046
Commit
606df046
authored
Jun 16, 2014
by
vbystricky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix pointer conversion
parent
9bf296ee
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
integral_sum.cl
modules/imgproc/src/opencl/integral_sum.cl
+5
-5
sumpixels.cpp
modules/imgproc/src/sumpixels.cpp
+1
-1
No files found.
modules/imgproc/src/opencl/integral_sum.cl
View file @
606df046
...
...
@@ -71,10 +71,10 @@
#
endif
kernel
void
integral_sum_cols
(
__global
uchar4
*src,
__global
uchar
*sum_ptr,
kernel
void
integral_sum_cols
(
__global
const
uchar4
*src,
__global
uchar
*sum_ptr,
int
src_offset,
int
rows,
int
cols,
int
src_step,
int
dst_step
)
{
sumT
*sum
=
(
sumT
*
)
sum_ptr
;
__global
sumT
*sum
=
(
__global
sumT
*
)
sum_ptr
;
int
lid
=
get_local_id
(
0
)
;
int
gid
=
get_group_id
(
0
)
;
vecSumT
src_t[2],
sum_t[2]
;
...
...
@@ -173,11 +173,11 @@ kernel void integral_sum_cols(__global uchar4 *src, __global uchar *sum_ptr,
}
kernel
void
integral_sum_rows
(
__global
uchar
*srcsum_ptr,
__global
uchar
*sum_ptr,
kernel
void
integral_sum_rows
(
__global
const
uchar
*srcsum_ptr,
__global
uchar
*sum_ptr,
int
rows,
int
cols,
int
src_step,
int
sum_step,
int
sum_offset
)
{
vecSumT
*srcsum
=
(
vecSumT
*
)
srcsum_ptr
;
sumT
*sum
=
(
sumT
*
)
sum_ptr
;
__global
const
vecSumT
*srcsum
=
(
__global
const
vecSumT
*
)
srcsum_ptr
;
__global
sumT
*sum
=
(
__global
sumT
*
)
sum_ptr
;
int
lid
=
get_local_id
(
0
)
;
int
gid
=
get_group_id
(
0
)
;
vecSumT
src_t[2],
sum_t[2]
;
...
...
modules/imgproc/src/sumpixels.cpp
View file @
606df046
...
...
@@ -266,7 +266,7 @@ static bool ocl_integral( InputArray _src, OutputArray _sum, int sdepth )
ocl
::
Kernel
k2
(
"integral_sum_rows"
,
ocl
::
imgproc
::
integral_sum_oclsrc
,
format
(
"-D sdepth=%d"
,
sdepth
));
k2
.
args
(
ocl
::
KernelArg
::
PtrRead
Write
(
t_sum
),
ocl
::
KernelArg
::
PtrWriteOnly
(
sum
),
k2
.
args
(
ocl
::
KernelArg
::
PtrRead
Only
(
t_sum
),
ocl
::
KernelArg
::
PtrWriteOnly
(
sum
),
t_sum
.
rows
,
t_sum
.
cols
,
(
int
)
t_sum
.
step
,
(
int
)
sum
.
step
,
sum_offset
);
size_t
gt2
=
t_sum
.
cols
*
32
,
lt2
=
256
;
...
...
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