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

Merge pull request #11714 from alalek:win32_waitKey_accuracy

Browse Source
This commit is contained in:
Alexander Alekhin 2018-06-09 12:10:24 +00:00
commit 34fc8e9260
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/highgui/src/window_w32.cpp
View File

@ -1965,7 +1965,8 @@ static void showSaveDialog(CvWindow* window)
CV_IMPL int CV_IMPL int
cvWaitKey( int delay ) cvWaitKey( int delay )
{ {
int time0 = GetTickCount(); int64 time0 = cv::getTickCount();
int64 timeEnd = time0 + (int64)(delay * 0.001f * cv::getTickFrequency());
for(;;) for(;;)
{ {
@ -1973,13 +1974,13 @@ cvWaitKey( int delay )
MSG message; MSG message;
int is_processed = 0; int is_processed = 0;
if( (delay > 0 && abs((int)(GetTickCount() - time0)) >= delay) || hg_windows == 0 )
return -1;
if( delay <= 0 ) if( delay <= 0 )
GetMessage(&message, 0, 0, 0); GetMessage(&message, 0, 0, 0);
else if( PeekMessage(&message, 0, 0, 0, PM_REMOVE) == FALSE ) else if( PeekMessage(&message, 0, 0, 0, PM_REMOVE) == FALSE )
{ {
int64 t = cv::getTickCount();
if (t - timeEnd >= 0)
return -1; // no messages and no more time
Sleep(1); Sleep(1);
continue; continue;
} }