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
1836d41b
Commit
1836d41b
authored
Dec 11, 2015
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
warning fix (MSVS2015)
parent
fe2f5c17
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
dxt.cpp
modules/core/src/dxt.cpp
+1
-1
opencl-opencv-interop.cpp
samples/opencl/opencl-opencv-interop.cpp
+2
-2
No files found.
modules/core/src/dxt.cpp
View file @
1836d41b
...
@@ -2215,7 +2215,7 @@ class PlanCache
...
@@ -2215,7 +2215,7 @@ class PlanCache
clAmdFftDim
dim
=
dft_size
.
height
==
1
||
dft_rows
?
CLFFT_1D
:
CLFFT_2D
;
clAmdFftDim
dim
=
dft_size
.
height
==
1
||
dft_rows
?
CLFFT_1D
:
CLFFT_2D
;
size_t
batchSize
=
dft_rows
?
dft_size
.
height
:
1
;
size_t
batchSize
=
dft_rows
?
dft_size
.
height
:
1
;
size_t
clLengthsIn
[
3
]
=
{
dft_size
.
width
,
dft_rows
?
1
:
dft_size
.
height
,
1
};
size_t
clLengthsIn
[
3
]
=
{
(
size_t
)
dft_size
.
width
,
dft_rows
?
1
:
(
size_t
)
dft_size
.
height
,
1
};
size_t
clStridesIn
[
3
]
=
{
1
,
1
,
1
};
size_t
clStridesIn
[
3
]
=
{
1
,
1
,
1
};
size_t
clStridesOut
[
3
]
=
{
1
,
1
,
1
};
size_t
clStridesOut
[
3
]
=
{
1
,
1
,
1
};
int
elemSize
=
doubleFP
?
sizeof
(
double
)
:
sizeof
(
float
);
int
elemSize
=
doubleFP
?
sizeof
(
double
)
:
sizeof
(
float
);
...
...
samples/opencl/opencl-opencv-interop.cpp
View file @
1836d41b
...
@@ -770,7 +770,7 @@ int App::process_frame_with_open_cl(cv::Mat& frame, bool use_buffer, cl_mem* mem
...
@@ -770,7 +770,7 @@ int App::process_frame_with_open_cl(cv::Mat& frame, bool use_buffer, cl_mem* mem
return
-
1
;
return
-
1
;
size_t
origin
[]
=
{
0
,
0
,
0
};
size_t
origin
[]
=
{
0
,
0
,
0
};
size_t
region
[]
=
{
frame
.
cols
,
frame
.
rows
,
1
};
size_t
region
[]
=
{
(
size_t
)
frame
.
cols
,
(
size_t
)
frame
.
rows
,
1
};
res
=
clEnqueueCopyImage
(
m_queue
,
m_img_src
,
mem
,
origin
,
origin
,
region
,
0
,
0
,
&
m_event
);
res
=
clEnqueueCopyImage
(
m_queue
,
m_img_src
,
mem
,
origin
,
origin
,
region
,
0
,
0
,
&
m_event
);
if
(
CL_SUCCESS
!=
res
)
if
(
CL_SUCCESS
!=
res
)
return
-
1
;
return
-
1
;
...
@@ -796,7 +796,7 @@ int App::process_frame_with_open_cl(cv::Mat& frame, bool use_buffer, cl_mem* mem
...
@@ -796,7 +796,7 @@ int App::process_frame_with_open_cl(cv::Mat& frame, bool use_buffer, cl_mem* mem
return
-
1
;
return
-
1
;
// process left half of frame in OpenCL
// process left half of frame in OpenCL
size_t
size
[]
=
{
frame
.
cols
/
2
,
frame
.
rows
};
size_t
size
[]
=
{
(
size_t
)
frame
.
cols
/
2
,
(
size_t
)
frame
.
rows
};
res
=
clEnqueueNDRangeKernel
(
m_queue
,
kernel
,
2
,
0
,
size
,
0
,
0
,
0
,
&
m_event
);
res
=
clEnqueueNDRangeKernel
(
m_queue
,
kernel
,
2
,
0
,
size
,
0
,
0
,
0
,
&
m_event
);
if
(
CL_SUCCESS
!=
res
)
if
(
CL_SUCCESS
!=
res
)
return
-
1
;
return
-
1
;
...
...
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