highgui: preserve waitKey -1 return value

This commit is contained in:
Alexander Alekhin 2016-12-28 13:06:28 +03:00
parent 7dd3723abe
commit d015b55e6b

View File

@ -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,