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

reorder defined checks according to cmake file

Browse Source
This commit is contained in:
Smirnov Egor 2021-06-16 11:36:13 +03:00
parent 651967b95c
commit 7a276f39fb
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/highgui/src/window.cpp
View File

@ -630,9 +630,8 @@ int cv::waitKey(int delay)
return (code != -1) ? (code & 0xff) : -1;
}
#if defined(HAVE_WIN32UI)
// pollKey() implemented in window_w32.cpp
#elif defined(HAVE_GTK) || defined(HAVE_COCOA) || defined(HAVE_QT) || (defined (WINRT) && !defined (WINRT_8_0))
#if defined(HAVE_QT) || (defined (WINRT) && !defined (WINRT_8_0)) || \
!defined(HAVE_WIN32UI) && (defined(HAVE_GTK) || defined(HAVE_COCOA))
// pollKey() fallback implementation
int cv::pollKey()
{
@ -650,6 +649,8 @@ int cv::pollKey()
// fallback. please implement a proper polling function
return cvWaitKey(1);
}
#elif defined(HAVE_WIN32UI)
// pollKey() implemented in window_w32.cpp
#endif
int cv::createTrackbar(const String& trackbarName, const String& winName,