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
fe4f27b9
Commit
fe4f27b9
authored
Oct 22, 2019
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gapi: fix build
- gcc 4.8.4 (ARMv7)
parent
24771037
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
goclkernel.hpp
modules/gapi/include/opencv2/gapi/ocl/goclkernel.hpp
+1
-1
gstreamingexecutor.cpp
modules/gapi/src/executor/gstreamingexecutor.cpp
+1
-1
No files found.
modules/gapi/include/opencv2/gapi/ocl/goclkernel.hpp
View file @
fe4f27b9
...
@@ -119,7 +119,7 @@ template<class T> struct ocl_get_in
...
@@ -119,7 +119,7 @@ template<class T> struct ocl_get_in
struct
tracked_cv_umat
{
struct
tracked_cv_umat
{
//TODO Think if T - API could reallocate UMat to a proper size - how do we handle this ?
//TODO Think if T - API could reallocate UMat to a proper size - how do we handle this ?
//tracked_cv_umat(cv::UMat& m) : r{(m)}, original_data{m.getMat(ACCESS_RW).data} {}
//tracked_cv_umat(cv::UMat& m) : r{(m)}, original_data{m.getMat(ACCESS_RW).data} {}
tracked_cv_umat
(
cv
::
UMat
&
m
)
:
r
{
(
m
)
}
,
original_data
{
nullptr
}
{}
tracked_cv_umat
(
cv
::
UMat
&
m
)
:
r
(
m
)
,
original_data
{
nullptr
}
{}
cv
::
UMat
&
r
;
// FIXME: It was a value (not a reference) before.
cv
::
UMat
&
r
;
// FIXME: It was a value (not a reference) before.
// Actually OCL backend should allocate its internal data!
// Actually OCL backend should allocate its internal data!
uchar
*
original_data
;
uchar
*
original_data
;
...
...
modules/gapi/src/executor/gstreamingexecutor.cpp
View file @
fe4f27b9
...
@@ -546,7 +546,7 @@ void cv::gimpl::GStreamingExecutor::setSource(GRunArgs &&ins)
...
@@ -546,7 +546,7 @@ void cv::gimpl::GStreamingExecutor::setSource(GRunArgs &&ins)
return
util
::
holds_alternative
<
cv
::
gapi
::
wip
::
IStreamSource
::
Ptr
>
(
arg
);
return
util
::
holds_alternative
<
cv
::
gapi
::
wip
::
IStreamSource
::
Ptr
>
(
arg
);
};
};
const
auto
num_videos
=
std
::
count_if
(
ins
.
begin
(),
ins
.
end
(),
is_video
);
const
auto
num_videos
=
std
::
count_if
(
ins
.
begin
(),
ins
.
end
(),
is_video
);
if
(
num_videos
>
1
u
)
if
(
num_videos
>
1
)
{
{
// See below why (another reason - no documented behavior
// See below why (another reason - no documented behavior
// on handling videos streams of different length)
// on handling videos streams of different length)
...
...
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