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

Merge pull request #7935 from alalek:fix_waitKey

Browse Source
This commit is contained in:
Vadim Pisarevsky 2017-01-10 11:18:13 +00:00
commit b345c6e552
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -218,7 +218,7 @@ int cv::waitKey(int delay)
if (use_legacy > 0) if (use_legacy > 0)
return code; return code;
#endif #endif
return code & 0xff; return (code != -1) ? (code & 0xff) : -1;
} }
int cv::createTrackbar(const String& trackbarName, const String& winName, int cv::createTrackbar(const String& trackbarName, const String& winName,