Merge pull request #6228 from wangguoqin1001:2.4

2016-03-10 08:10:19 +00:00 · 2016-03-10 08:10:19 +00:00 · 7e44faf635
commit 7e44faf635
parent ea049e147d 8cfc87cf01
1 changed files with 7 additions and 0 deletions
--- a/modules/highgui/src/cap_qtkit.mm
+++ b/modules/highgui/src/cap_qtkit.mm
@ -95,6 +95,8 @@ didDropVideoFrameWithSampleBuffer:(QTSampleBuffer *)sampleBuffer
 - (int)updateImage;
 - (IplImage*)getOutput;

+- (void)doFireTimer:(NSTimer *)timer;
+
@end

 /*****************************************************************************
@ -625,6 +627,11 @@ didDropVideoFrameWithSampleBuffer:(QTSampleBuffer *)sampleBuffer
    return 1;
 }

+- (void)doFireTimer:(NSTimer *)timer {
+    (void)timer;
+    // dummy
+}
+
@end