revert patch from PR 1074, since it break capturing on MacOSX

12 years ago · be040ff513
parent 886c009da6
commit be040ff513
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];