Merge pull request #6228 from wangguoqin1001:2.4

7e44faf6 · Maksim Shabunin · ea049e14 · 8cfc87cf · 7e44faf6
Commit 7e44faf6 authored Mar 10, 2016 by Maksim Shabunin
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

cap_qtkit.mm modules/highgui/src/cap_qtkit.mm +7 -0

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