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
1b13df53
Commit
1b13df53
authored
Nov 20, 2018
by
Dmitry Matveev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
G-API: Recent inclusion has broken STANDALONE build
This MR fixes this.
parent
083332f8
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
0 deletions
+18
-0
gbackend.cpp
modules/gapi/src/api/gbackend.cpp
+18
-0
No files found.
modules/gapi/src/api/gbackend.cpp
View file @
1b13df53
...
...
@@ -94,8 +94,12 @@ void bindInArg(Mag& mag, const RcDesc &rc, const GRunArg &arg, bool is_umat)
case
GRunArg
:
:
index_of
<
cv
::
gapi
::
own
::
Mat
>
()
:
if
(
is_umat
)
{
#if !defined(GAPI_STANDALONE)
auto
&
mag_umat
=
mag
.
template
slot
<
cv
::
UMat
>
()[
rc
.
id
];
mag_umat
=
to_ocv
(
util
::
get
<
cv
::
gapi
::
own
::
Mat
>
(
arg
)).
getUMat
(
ACCESS_READ
);
#else
util
::
throw_error
(
std
::
logic_error
(
"UMat is not supported in stadnalone build"
));
#endif // !defined(GAPI_STANDALONE)
}
else
{
...
...
@@ -157,8 +161,12 @@ void bindOutArg(Mag& mag, const RcDesc &rc, const GRunArgP &arg, bool is_umat)
case
GRunArgP
:
:
index_of
<
cv
::
gapi
::
own
::
Mat
*>
()
:
if
(
is_umat
)
{
#if !defined(GAPI_STANDALONE)
auto
&
mag_umat
=
mag
.
template
slot
<
cv
::
UMat
>
()[
rc
.
id
];
mag_umat
=
to_ocv
(
*
(
util
::
get
<
cv
::
gapi
::
own
::
Mat
*>
(
arg
))).
getUMat
(
ACCESS_RW
);
#else
util
::
throw_error
(
std
::
logic_error
(
"UMat is not supported in standalone build"
));
#endif // !defined(GAPI_STANDALONE)
}
else
{
...
...
@@ -256,7 +264,13 @@ cv::GRunArgP getObjPtr(Mag& mag, const RcDesc &rc, bool is_umat)
{
case
GShape
:
:
GMAT
:
if
(
is_umat
)
{
#if !defined(GAPI_STANDALONE)
return
GRunArgP
(
&
mag
.
template
slot
<
cv
::
UMat
>
()[
rc
.
id
]);
#else
util
::
throw_error
(
std
::
logic_error
(
"UMat is not supported in standalone build"
));
#endif // !defined(GAPI_STANDALONE)
}
else
return
GRunArgP
(
&
mag
.
template
slot
<
cv
::
gapi
::
own
::
Mat
>
()[
rc
.
id
]);
case
GShape
:
:
GSCALAR
:
return
GRunArgP
(
&
mag
.
template
slot
<
cv
::
gapi
::
own
::
Scalar
>
()[
rc
.
id
]);
...
...
@@ -300,8 +314,12 @@ void writeBack(const Mag& mag, const RcDesc &rc, GRunArgP &g_arg, bool is_umat)
}
if
(
is_umat
)
{
#if !defined(GAPI_STANDALONE)
auto
&
in_mag
=
mag
.
template
slot
<
cv
::
UMat
>
().
at
(
rc
.
id
);
GAPI_Assert
((
out_arg_data
==
(
in_mag
.
getMat
(
ACCESS_RW
).
data
))
&&
" data for output parameters was reallocated ?"
);
#else
util
::
throw_error
(
std
::
logic_error
(
"UMat is not supported in standalone build"
));
#endif // !defined(GAPI_STANDALONE)
}
else
{
...
...
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