Merge pull request #1129 from vpisarev:revert_bad_qtkit_patch

77fe7f47 · Roman Donchenko · OpenCV Buildbot · 886c009d · be040ff5 · 77fe7f47
Commit 77fe7f47 authored Jul 17, 2013 by Roman Donchenko Committed by OpenCV Buildbot Jul 17, 2013
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

cap_qtkit.mm modules/highgui/src/cap_qtkit.mm +5 -2

No files found.
--- 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];