Merge pull request #1129

An error occurred

from vpisarev:revert_bad_qtkit_patch

12 years ago · 77fe7f479c
parent 886c009da6 be040ff513
commit 77fe7f479c
1 changed files with 5 additions and 2 deletions
--- a/modules/highgui/src/cap_qtkit.mm
+++ b/modules/highgui/src/cap_qtkit.mm
@ -277,8 +277,11 @@ bool CvCaptureCAM::grabFrame(double timeOut) {
    double sleepTime = 0.005;
    double total = 0;

-    while (![capture updateImage] && (total += sleepTime)<=timeOut)
-        usleep((int)(sleepTime*1000));
+    NSDate *loopUntil = [NSDate dateWithTimeIntervalSinceNow:sleepTime];
+    while (![capture updateImage] && (total += sleepTime)<=timeOut &&
+           [[NSRunLoop currentRunLoop] runMode: NSDefaultRunLoopMode
+                                    beforeDate:loopUntil])
+        loopUntil = [NSDate dateWithTimeIntervalSinceNow:sleepTime];

    [localpool drain];