Commit c10283b2 authored by Dal Rupnik's avatar Dal Rupnik

Replaced macro with built-in OpenCV export

parent a50efda4
...@@ -32,8 +32,6 @@ ...@@ -32,8 +32,6 @@
#import <ImageIO/ImageIO.h> #import <ImageIO/ImageIO.h>
#include "opencv2/core.hpp" #include "opencv2/core.hpp"
#define OPENCV_OBJC_EXPORT __attribute__((visibility("default")))
//! @addtogroup videoio_ios //! @addtogroup videoio_ios
//! @{ //! @{
...@@ -41,7 +39,7 @@ ...@@ -41,7 +39,7 @@
@class CvAbstractCamera; @class CvAbstractCamera;
OPENCV_OBJC_EXPORT @interface CvAbstractCamera : NSObject CV_EXPORTS @interface CvAbstractCamera : NSObject
{ {
UIDeviceOrientation currentDeviceOrientation; UIDeviceOrientation currentDeviceOrientation;
...@@ -89,7 +87,7 @@ OPENCV_OBJC_EXPORT @interface CvAbstractCamera : NSObject ...@@ -89,7 +87,7 @@ OPENCV_OBJC_EXPORT @interface CvAbstractCamera : NSObject
@class CvVideoCamera; @class CvVideoCamera;
OPENCV_OBJC_EXPORT @protocol CvVideoCameraDelegate <NSObject> CV_EXPORTS @protocol CvVideoCameraDelegate <NSObject>
#ifdef __cplusplus #ifdef __cplusplus
// delegate method for processing image frames // delegate method for processing image frames
...@@ -98,7 +96,7 @@ OPENCV_OBJC_EXPORT @protocol CvVideoCameraDelegate <NSObject> ...@@ -98,7 +96,7 @@ OPENCV_OBJC_EXPORT @protocol CvVideoCameraDelegate <NSObject>
@end @end
OPENCV_OBJC_EXPORT @interface CvVideoCamera : CvAbstractCamera<AVCaptureVideoDataOutputSampleBufferDelegate> CV_EXPORTS @interface CvVideoCamera : CvAbstractCamera<AVCaptureVideoDataOutputSampleBufferDelegate>
{ {
AVCaptureVideoDataOutput *videoDataOutput; AVCaptureVideoDataOutput *videoDataOutput;
...@@ -131,14 +129,14 @@ OPENCV_OBJC_EXPORT @interface CvVideoCamera : CvAbstractCamera<AVCaptureVideoDat ...@@ -131,14 +129,14 @@ OPENCV_OBJC_EXPORT @interface CvVideoCamera : CvAbstractCamera<AVCaptureVideoDat
@class CvPhotoCamera; @class CvPhotoCamera;
OPENCV_OBJC_EXPORT @protocol CvPhotoCameraDelegate <NSObject> CV_EXPORTS @protocol CvPhotoCameraDelegate <NSObject>
- (void)photoCamera:(CvPhotoCamera*)photoCamera capturedImage:(UIImage *)image; - (void)photoCamera:(CvPhotoCamera*)photoCamera capturedImage:(UIImage *)image;
- (void)photoCameraCancel:(CvPhotoCamera*)photoCamera; - (void)photoCameraCancel:(CvPhotoCamera*)photoCamera;
@end @end
OPENCV_OBJC_EXPORT @interface CvPhotoCamera : CvAbstractCamera CV_EXPORTS @interface CvPhotoCamera : CvAbstractCamera
{ {
AVCaptureStillImageOutput *stillImageOutput; AVCaptureStillImageOutput *stillImageOutput;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment