Merge pull request #1074 from devernay:2.4-cap_qt-multithread

c4e59866 · Roman Donchenko · OpenCV Buildbot · b6b1d5e7 · b524e275 · c4e59866
Commit c4e59866 authored Jul 05, 2013 by Roman Donchenko Committed by OpenCV Buildbot Jul 05, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

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

No files found.
--- a/modules/highgui/src/cap_qtkit.mm
+++ b/modules/highgui/src/cap_qtkit.mm
@@ -277,11 +277,8 @@ bool CvCaptureCAM::grabFrame(double timeOut) {
    double sleepTime = 0.005;
    double total = 0;
-    NSDate *loopUntil = [NSDate dateWithTimeIntervalSinceNow:sleepTime];
+    while (![capture updateImage] && (total += sleepTime)<=timeOut)
-    while (![capture updateImage] && (total += sleepTime)<=timeOut &&
+        usleep((int)(sleepTime*1000));
-           [[NSRunLoop currentRunLoop] runMode: NSDefaultRunLoopMode
-                                    beforeDate:loopUntil])
-        loopUntil = [NSDate dateWithTimeIntervalSinceNow:sleepTime];
    [localpool drain];