potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

Merge pull request #15282 from andrey-golubev:rename_argkind_opaque

Browse Source 
* G-API: rename ArgKind OPAQUE to GOPAQUE

Rename ArgKind value to GOPAQUE to fix conflict in the
user code when wingdi.h is included: it defines OPAQUE
macro that (for some reason) is chosen instead of ArgKind
value

* Add compatibility with existing API

* Renamed GOPAQUE to OPAQUE_VAL
This commit is contained in:
Andrey Golubev
2019-08-13 13:57:27 +03:00
committed by Alexander Alekhin
parent 183fc43a67
commit bf0765fc7f
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gapi/test/internal/gapi_int_garg_test.cpp
+8 -8
View File
@@ -39,14 +39,14 @@ using GArg_Test_Types = ::testing::Types
, Expected<cv::GArray<cv::Rect>, cv::detail::ArgKind::GARRAY>
// Built-in types
, Expected<int, cv::detail::ArgKind::OPAQUE>
, Expected<float, cv::detail::ArgKind::OPAQUE>
, Expected<int*, cv::detail::ArgKind::OPAQUE>
, Expected<cv::Point, cv::detail::ArgKind::OPAQUE>
, Expected<std::string, cv::detail::ArgKind::OPAQUE>
, Expected<cv::Mat, cv::detail::ArgKind::OPAQUE>
, Expected<std::vector<int>, cv::detail::ArgKind::OPAQUE>
, Expected<std::vector<cv::Point>, cv::detail::ArgKind::OPAQUE>
, Expected<int, cv::detail::ArgKind::OPAQUE_VAL>
, Expected<float, cv::detail::ArgKind::OPAQUE_VAL>
, Expected<int*, cv::detail::ArgKind::OPAQUE_VAL>
, Expected<cv::Point, cv::detail::ArgKind::OPAQUE_VAL>
, Expected<std::string, cv::detail::ArgKind::OPAQUE_VAL>
, Expected<cv::Mat, cv::detail::ArgKind::OPAQUE_VAL>
, Expected<std::vector<int>, cv::detail::ArgKind::OPAQUE_VAL>
, Expected<std::vector<cv::Point>, cv::detail::ArgKind::OPAQUE_VAL>
>;
TYPED_TEST_CASE(GArgKind, GArg_Test_Types);