From be040ff513f2fea4cf05b9cd847dcf6342cb5833 Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Tue, 16 Jul 2013 15:02:33 +0400 Subject: [PATCH] revert patch from PR 1074, since it break capturing on MacOSX --- modules/highgui/src/cap_qtkit.mm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/highgui/src/cap_qtkit.mm b/modules/highgui/src/cap_qtkit.mm index 207f01b..c7afffa 100644 --- 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]; -- 2.7.4