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
6fb780ea
Unverified
Commit
6fb780ea
authored
6 years ago
by
Alexander Alekhin
Committed by
GitHub
6 years ago
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #13088 from alalek:gapi_fix_arm_build
parents
11eafca3
386733ae
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
ggpukernel.hpp
modules/gapi/include/opencv2/gapi/gpu/ggpukernel.hpp
+1
-1
No files found.
modules/gapi/include/opencv2/gapi/gpu/ggpukernel.hpp
View file @
6fb780ea
...
@@ -125,7 +125,7 @@ struct tracked_cv_umat{
...
@@ -125,7 +125,7 @@ struct tracked_cv_umat{
struct
scalar_wrapper_gpu
struct
scalar_wrapper_gpu
{
{
//FIXME reuse CPU (OpenCV) plugin code
//FIXME reuse CPU (OpenCV) plugin code
scalar_wrapper_gpu
(
cv
::
gapi
::
own
::
Scalar
&
s
)
:
m_s
{
cv
::
gapi
::
own
::
to_ocv
(
s
)},
m_org_s
{
s
}
{};
scalar_wrapper_gpu
(
cv
::
gapi
::
own
::
Scalar
&
s
)
:
m_s
{
cv
::
gapi
::
own
::
to_ocv
(
s
)},
m_org_s
(
s
)
{};
operator
cv
::
Scalar
&
()
{
return
m_s
;
}
operator
cv
::
Scalar
&
()
{
return
m_s
;
}
void
writeBack
()
const
{
m_org_s
=
to_own
(
m_s
);
}
void
writeBack
()
const
{
m_org_s
=
to_own
(
m_s
);
}
...
...
This diff is collapsed.
Click to expand it.
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