Skip to content

Commit c10283b

Browse files
committed
Replaced macro with built-in OpenCV export
1 parent a50efda commit c10283b

File tree

1 file changed

+5
-7
lines changed
  • modules/videoio/include/opencv2/videoio

1 file changed

+5
-7
lines changed

modules/videoio/include/opencv2/videoio/cap_ios.h

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,14 @@
3232
#import <ImageIO/ImageIO.h>
3333
#include "opencv2/core.hpp"
3434

35-
#define OPENCV_OBJC_EXPORT __attribute__((visibility("default")))
36-
3735
//! @addtogroup videoio_ios
3836
//! @{
3937

4038
/////////////////////////////////////// CvAbstractCamera /////////////////////////////////////
4139

4240
@class CvAbstractCamera;
4341

44-
OPENCV_OBJC_EXPORT @interface CvAbstractCamera : NSObject
42+
CV_EXPORTS @interface CvAbstractCamera : NSObject
4543
{
4644
UIDeviceOrientation currentDeviceOrientation;
4745

@@ -89,7 +87,7 @@ OPENCV_OBJC_EXPORT @interface CvAbstractCamera : NSObject
8987

9088
@class CvVideoCamera;
9189

92-
OPENCV_OBJC_EXPORT @protocol CvVideoCameraDelegate <NSObject>
90+
CV_EXPORTS @protocol CvVideoCameraDelegate <NSObject>
9391

9492
#ifdef __cplusplus
9593
// delegate method for processing image frames
@@ -98,7 +96,7 @@ OPENCV_OBJC_EXPORT @protocol CvVideoCameraDelegate <NSObject>
9896

9997
@end
10098

101-
OPENCV_OBJC_EXPORT @interface CvVideoCamera : CvAbstractCamera<AVCaptureVideoDataOutputSampleBufferDelegate>
99+
CV_EXPORTS @interface CvVideoCamera : CvAbstractCamera<AVCaptureVideoDataOutputSampleBufferDelegate>
102100
{
103101
AVCaptureVideoDataOutput *videoDataOutput;
104102

@@ -131,14 +129,14 @@ OPENCV_OBJC_EXPORT @interface CvVideoCamera : CvAbstractCamera<AVCaptureVideoDat
131129

132130
@class CvPhotoCamera;
133131

134-
OPENCV_OBJC_EXPORT @protocol CvPhotoCameraDelegate <NSObject>
132+
CV_EXPORTS @protocol CvPhotoCameraDelegate <NSObject>
135133

136134
- (void)photoCamera:(CvPhotoCamera*)photoCamera capturedImage:(UIImage *)image;
137135
- (void)photoCameraCancel:(CvPhotoCamera*)photoCamera;
138136

139137
@end
140138

141-
OPENCV_OBJC_EXPORT @interface CvPhotoCamera : CvAbstractCamera
139+
CV_EXPORTS @interface CvPhotoCamera : CvAbstractCamera
142140
{
143141
AVCaptureStillImageOutput *stillImageOutput;
144142
}

0 commit comments

Comments
 (0)