mirror of
https://github.com/opencv/opencv.git
synced 2026-07-27 06:13:05 +04:00
Merge pull request #22935 from alalek:gapi_error
G-API: replace GAPI_Assert() with 'false' and '0' to GAPI_Error() * gapi: GAPI_Error() macro * gapi: replace GAPI_Assert() with 'false' and '0' to GAPI_Error() * build: eliminate 'unreachable code' after CV_Error() (MSVC 2015) * build: eliminate 'unreachable code' warning for MSVS 2015/2017 - observed in constructors stubs with throwing exception
This commit is contained in:
committed by
GitHub
parent
420db56ffd
commit
91998d6424
@@ -22,7 +22,7 @@
|
||||
switch(type) { \
|
||||
LIST_G(HC, HC) \
|
||||
default: \
|
||||
GAPI_Assert(false && "Unsupported type"); \
|
||||
GAPI_Error("Unsupported type"); \
|
||||
}
|
||||
|
||||
using cv::gapi::wip::draw::Prim;
|
||||
@@ -157,7 +157,7 @@ public:
|
||||
SWITCH(m_arg.index(), GOPAQUE_TYPE_LIST_G, HC)
|
||||
#undef HC
|
||||
|
||||
GAPI_Assert(false);
|
||||
GAPI_Error("InternalError");
|
||||
}
|
||||
|
||||
GAPI_WRAP gapi::ArgType type() { return m_type; }
|
||||
@@ -195,7 +195,7 @@ public:
|
||||
SWITCH(m_arg.index(), GARRAY_TYPE_LIST_G, HC)
|
||||
#undef HC
|
||||
|
||||
GAPI_Assert(false);
|
||||
GAPI_Error("InternalError");
|
||||
}
|
||||
|
||||
GAPI_WRAP gapi::ArgType type() { return m_type; }
|
||||
|
||||
Reference in New Issue
Block a user