highgui: preserve waitKey -1 return value

2016-12-28 13:06:28 +03:00 · 2016-12-28 13:06:28 +03:00 · d015b55e6b
commit d015b55e6b
parent 7dd3723abe
1 changed files with 1 additions and 1 deletions
--- a/modules/highgui/src/window.cpp
+++ b/modules/highgui/src/window.cpp
@ -218,7 +218,7 @@ int cv::waitKey(int delay)
    if (use_legacy > 0)
        return code;
 #endif
-    return code & 0xff;
+    return (code != -1) ? (code & 0xff) : -1;
 }

 int cv::createTrackbar(const String& trackbarName, const String& winName,