From c10283b2b6d01dc477d6b9f8d264c9eb2ebad124 Mon Sep 17 00:00:00 2001 From: Dal Rupnik Date: Tue, 24 Jan 2017 10:26:19 +0100 Subject: [PATCH] Replaced macro with built-in OpenCV export --- modules/videoio/include/opencv2/videoio/cap_ios.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/modules/videoio/include/opencv2/videoio/cap_ios.h b/modules/videoio/include/opencv2/videoio/cap_ios.h index 93c8a0c..0691420 100644 --- a/modules/videoio/include/opencv2/videoio/cap_ios.h +++ b/modules/videoio/include/opencv2/videoio/cap_ios.h @@ -32,8 +32,6 @@ #import #include "opencv2/core.hpp" -#define OPENCV_OBJC_EXPORT __attribute__((visibility("default"))) - //! @addtogroup videoio_ios //! @{ @@ -41,7 +39,7 @@ @class CvAbstractCamera; -OPENCV_OBJC_EXPORT @interface CvAbstractCamera : NSObject +CV_EXPORTS @interface CvAbstractCamera : NSObject { UIDeviceOrientation currentDeviceOrientation; @@ -89,7 +87,7 @@ OPENCV_OBJC_EXPORT @interface CvAbstractCamera : NSObject @class CvVideoCamera; -OPENCV_OBJC_EXPORT @protocol CvVideoCameraDelegate +CV_EXPORTS @protocol CvVideoCameraDelegate #ifdef __cplusplus // delegate method for processing image frames @@ -98,7 +96,7 @@ OPENCV_OBJC_EXPORT @protocol CvVideoCameraDelegate @end -OPENCV_OBJC_EXPORT @interface CvVideoCamera : CvAbstractCamera +CV_EXPORTS @interface CvVideoCamera : CvAbstractCamera { AVCaptureVideoDataOutput *videoDataOutput; @@ -131,14 +129,14 @@ OPENCV_OBJC_EXPORT @interface CvVideoCamera : CvAbstractCamera +CV_EXPORTS @protocol CvPhotoCameraDelegate - (void)photoCamera:(CvPhotoCamera*)photoCamera capturedImage:(UIImage *)image; - (void)photoCameraCancel:(CvPhotoCamera*)photoCamera; @end -OPENCV_OBJC_EXPORT @interface CvPhotoCamera : CvAbstractCamera +CV_EXPORTS @interface CvPhotoCamera : CvAbstractCamera { AVCaptureStillImageOutput *stillImageOutput; } -- 2.7.4