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

Merge pull request #20272 from rogday:pollKey_link

Browse Source
This commit is contained in:
Alexander Alekhin 2021-06-17 11:01:37 +00:00
commit f30f1afd47
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; return (code != -1) ? (code & 0xff) : -1;
} }
#if defined(HAVE_WIN32UI) #if defined(HAVE_QT) || (defined (WINRT) && !defined (WINRT_8_0)) || \
// pollKey() implemented in window_w32.cpp !defined(HAVE_WIN32UI) && (defined(HAVE_GTK) || defined(HAVE_COCOA))
#elif defined(HAVE_GTK) || defined(HAVE_COCOA) || defined(HAVE_QT) || (defined (WINRT) && !defined (WINRT_8_0))
// pollKey() fallback implementation // pollKey() fallback implementation
int cv::pollKey() int cv::pollKey()
{ {
@ -650,6 +649,8 @@ int cv::pollKey()
// fallback. please implement a proper polling function // fallback. please implement a proper polling function
return cvWaitKey(1); return cvWaitKey(1);
} }
#elif defined(HAVE_WIN32UI)
// pollKey() implemented in window_w32.cpp
#endif #endif
int cv::createTrackbar(const String& trackbarName, const String& winName, int cv::createTrackbar(const String& trackbarName, const String& winName,