third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects 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/include/opencv2/gapi/garg.hpp
+1 -1
View File
@@ -76,7 +76,7 @@ public:
return util::unsafe_any_cast<typename std::remove_reference<T>::type>(value);
}
detail::ArgKind kind = detail::ArgKind::OPAQUE;
detail::ArgKind kind = detail::ArgKind::OPAQUE_VAL;
protected:
util::any value;
modules/gapi/include/opencv2/gapi/gtype_traits.hpp
+6 -2
View File
@@ -26,7 +26,11 @@ namespace detail
// a double dispatch
enum class ArgKind: int
{
OPAQUE, // Unknown, generic, opaque-to-GAPI data type - STATIC
OPAQUE_VAL, // Unknown, generic, opaque-to-GAPI data type - STATIC
// Note: OPAQUE is sometimes defined in Win sys headers
#if !defined(OPAQUE) && !defined(CV_DOXYGEN)
OPAQUE = OPAQUE_VAL, // deprecated value used for compatibility, use OPAQUE_VAL instead
#endif
GOBJREF, // <internal> reference to object
GMAT, // a cv::GMat
GMATP, // a cv::GMatP
@@ -41,7 +45,7 @@ namespace detail
template<typename T> struct GTypeTraits;
template<typename T> struct GTypeTraits
{
static constexpr const ArgKind kind = ArgKind::OPAQUE;
static constexpr const ArgKind kind = ArgKind::OPAQUE_VAL;
};
template<> struct GTypeTraits<cv::GMat>
{