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
877dfae0
Commit
877dfae0
authored
Mar 22, 2013
by
Andrey Kamaev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix build of ocl module
parent
33ef7990
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
9 deletions
+9
-9
initialization.cpp
modules/ocl/src/initialization.cpp
+3
-3
matrix_operations.cpp
modules/ocl/src/matrix_operations.cpp
+2
-2
mcwutil.cpp
modules/ocl/src/mcwutil.cpp
+2
-2
pyrlk.cpp
modules/ocl/src/pyrlk.cpp
+2
-2
No files found.
modules/ocl/src/initialization.cpp
View file @
877dfae0
...
...
@@ -492,7 +492,7 @@ namespace cv
{
src_sign
<<
(
int64
)(
*
source
)
<<
clCxt
->
impl
->
oclcontext
;
}
srcsign
=
src_sign
.
str
();
srcsign
=
src_sign
.
str
()
.
c_str
()
;
program
=
NULL
;
program
=
programCache
->
progLookup
(
srcsign
);
...
...
@@ -613,7 +613,7 @@ namespace cv
idxStr
<<
"_C"
<<
channels
;
if
(
depth
!=
-
1
)
idxStr
<<
"_D"
<<
depth
;
kernelName
+=
idxStr
.
str
();
kernelName
=
kernelName
+
idxStr
.
str
().
c_
str
();
cl_kernel
kernel
;
kernel
=
openCLGetKernelFromSource
(
clCxt
,
source
,
kernelName
,
build_options
);
...
...
@@ -723,7 +723,7 @@ namespace cv
idxStr
<<
"_C"
<<
channels
;
if
(
depth
!=
-
1
)
idxStr
<<
"_D"
<<
depth
;
kernelName
+=
idxStr
.
str
();
kernelName
=
kernelName
+
idxStr
.
str
().
c_
str
();
cl_kernel
kernel
;
kernel
=
openCLGetKernelFromSource
(
clCxt
,
source
,
kernelName
,
build_options
);
...
...
modules/ocl/src/matrix_operations.cpp
View file @
877dfae0
...
...
@@ -353,9 +353,9 @@ void cv::ocl::oclMat::copyTo( oclMat &mat, const oclMat &mask) const
static
void
convert_run
(
const
oclMat
&
src
,
oclMat
&
dst
,
double
alpha
,
double
beta
)
{
String
kernelName
=
"convert_to_S"
;
S
tringstream
idxStr
;
std
::
s
tringstream
idxStr
;
idxStr
<<
src
.
depth
();
kernelName
+=
idxStr
.
str
();
kernelName
=
kernelName
+
idxStr
.
str
().
c_
str
();
float
alpha_f
=
alpha
,
beta_f
=
beta
;
CV_DbgAssert
(
src
.
rows
==
dst
.
rows
&&
src
.
cols
==
dst
.
cols
);
std
::
vector
<
std
::
pair
<
size_t
,
const
void
*>
>
args
;
...
...
modules/ocl/src/mcwutil.cpp
View file @
877dfae0
...
...
@@ -67,12 +67,12 @@ namespace cv
//construct kernel name
//The rule is functionName_Cn_Dn, C represent Channels, D Represent DataType Depth, n represent an integer number
//for exmaple split_C2_D2, represent the split kernel with channels =2 and dataType Depth = 2(Data type is char)
S
tringstream
idxStr
;
std
::
s
tringstream
idxStr
;
if
(
channels
!=
-
1
)
idxStr
<<
"_C"
<<
channels
;
if
(
depth
!=
-
1
)
idxStr
<<
"_D"
<<
depth
;
kernelName
+=
idxStr
.
str
();
kernelName
=
kernelName
+
idxStr
.
str
().
c_
str
();
cl_kernel
kernel
;
kernel
=
openCLGetKernelFromSource
(
clCxt
,
source
,
kernelName
,
build_options
);
...
...
modules/ocl/src/pyrlk.cpp
View file @
877dfae0
...
...
@@ -115,9 +115,9 @@ inline int divUp(int total, int grain)
static
void
convert_run_cus
(
const
oclMat
&
src
,
oclMat
&
dst
,
double
alpha
,
double
beta
)
{
String
kernelName
=
"convert_to_S"
;
S
tringstream
idxStr
;
std
::
s
tringstream
idxStr
;
idxStr
<<
src
.
depth
();
kernelName
+=
idxStr
.
str
();
kernelName
=
kernelName
+
idxStr
.
str
().
c_
str
();
float
alpha_f
=
(
float
)
alpha
,
beta_f
=
(
float
)
beta
;
CV_DbgAssert
(
src
.
rows
==
dst
.
rows
&&
src
.
cols
==
dst
.
cols
);
std
::
vector
<
std
::
pair
<
size_t
,
const
void
*>
>
args
;
...
...
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