Merge pull request #16975 from shimat:Branch_4.3.0

This commit is contained in:
Alexander Alekhin 2020-04-09 08:28:20 +00:00
commit e1f14fcac7

View File

@ -33,7 +33,7 @@
#include <assert.h> #include <assert.h>
#include <opencv2\highgui.hpp> #include <opencv2\highgui.hpp>
#include <opencv2\highgui\highgui_winrt.hpp> #include <opencv2\highgui\highgui_winrt.hpp>
#include <window_winrt_bridge.hpp> #include "window_winrt_bridge.hpp"
#define CV_WINRT_NO_GUI_ERROR( funcname ) \ #define CV_WINRT_NO_GUI_ERROR( funcname ) \
{ \ { \
@ -281,4 +281,4 @@ double cvGetModeWindow_WinRT(const char* name) {
CV_IMPL int cvStartWindowThread() { CV_IMPL int cvStartWindowThread() {
CV_WINRT_NO_GUI_ERROR("cvStartWindowThread"); CV_WINRT_NO_GUI_ERROR("cvStartWindowThread");
return CV_StsNotImplemented; return CV_StsNotImplemented;
} }