generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #6228 from wangguoqin1001:2.4

Browse Source
This commit is contained in:
Maksim Shabunin 2016-03-10 08:10:19 +00:00
commit 7e44faf635
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/highgui/src/cap_qtkit.mm
View File

@ -95,6 +95,8 @@ didDropVideoFrameWithSampleBuffer:(QTSampleBuffer *)sampleBuffer
- (int)updateImage; - (int)updateImage;
- (IplImage*)getOutput; - (IplImage*)getOutput;
- (void)doFireTimer:(NSTimer *)timer;
@end @end
/***************************************************************************** /*****************************************************************************
@ -625,6 +627,11 @@ didDropVideoFrameWithSampleBuffer:(QTSampleBuffer *)sampleBuffer
return 1; return 1;
} }
- (void)doFireTimer:(NSTimer *)timer {
(void)timer;
// dummy
}
@end @end