mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 14:36:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13350 from alalek:fix_kw_gapi

Browse Source
This commit is contained in:
Alexander Alekhin 2018-12-03 15:16:45 +00:00
commit 2dc5e245d0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/gapi/include/opencv2/gapi/own/assert.hpp
View File

@ -10,7 +10,8 @@
#if !defined(GAPI_STANDALONE) #if !defined(GAPI_STANDALONE)
#include <opencv2/core/base.hpp> #include <opencv2/core/base.hpp>
#define GAPI_Assert(expr) CV_Assert(expr) #define GAPI_Assert CV_Assert
#define GAPI_DbgAssert CV_DbgAssert
#else #else
#include <stdexcept> #include <stdexcept>
@ -30,7 +31,6 @@ namespace detail
#define GAPI_Assert(expr) \ #define GAPI_Assert(expr) \
{ if (!(expr)) ::detail::assert_abort(#expr, __LINE__, __FILE__, __func__); } { if (!(expr)) ::detail::assert_abort(#expr, __LINE__, __FILE__, __func__); }
#endif
#ifdef NDEBUG #ifdef NDEBUG
# define GAPI_DbgAssert(expr) # define GAPI_DbgAssert(expr)
@ -38,4 +38,6 @@ namespace detail
# define GAPI_DbgAssert(expr) GAPI_Assert(expr) # define GAPI_DbgAssert(expr) GAPI_Assert(expr)
#endif #endif
#endif // GAPI_STANDALONE
#endif // OPENCV_GAPI_OWN_ASSERT_HPP #endif // OPENCV_GAPI_OWN_ASSERT_HPP