potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #8060 from Legoless:master

Browse Source
This commit is contained in:
Alexander Alekhin
2017-01-25 11:32:24 +00:00
parent a446cb271f 576d43d1c2
commit 5c13ffb73e
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/videoio/include/opencv2/videoio/cap_ios.h
+5 -5
View File
@@ -39,7 +39,7 @@
@class CvAbstractCamera;
@interface CvAbstractCamera : NSObject
CV_EXPORTS @interface CvAbstractCamera : NSObject
{
UIDeviceOrientation currentDeviceOrientation;
@@ -87,7 +87,7 @@
@class CvVideoCamera;
@protocol CvVideoCameraDelegate <NSObject>
CV_EXPORTS @protocol CvVideoCameraDelegate <NSObject>
#ifdef __cplusplus
// delegate method for processing image frames
@@ -96,7 +96,7 @@
@end
@interface CvVideoCamera : CvAbstractCamera<AVCaptureVideoDataOutputSampleBufferDelegate>
CV_EXPORTS @interface CvVideoCamera : CvAbstractCamera<AVCaptureVideoDataOutputSampleBufferDelegate>
{
AVCaptureVideoDataOutput *videoDataOutput;
@@ -129,14 +129,14 @@
@class CvPhotoCamera;
@protocol CvPhotoCameraDelegate <NSObject>
CV_EXPORTS @protocol CvPhotoCameraDelegate <NSObject>
- (void)photoCamera:(CvPhotoCamera*)photoCamera capturedImage:(UIImage *)image;
- (void)photoCameraCancel:(CvPhotoCamera*)photoCamera;
@end
@interface CvPhotoCamera : CvAbstractCamera
CV_EXPORTS @interface CvPhotoCamera : CvAbstractCamera
{
AVCaptureStillImageOutput *stillImageOutput;
}