mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-13 04:52:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Unifies Obj-C property attributes changing retain to strong

Browse Source 
strong and retain are synonymous but using strong along with  obsolete synonym retain in one file is negligent
This commit is contained in:
Valeriy Van 2016-08-25 21:40:16 +03:00
parent 554017673a
commit f1db065c10
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/videoio/include/opencv2/videoio/cap_ios.h
View File

@ -64,8 +64,8 @@
int imageHeight; int imageHeight;
} }
@property (nonatomic, retain) AVCaptureSession* captureSession; @property (nonatomic, strong) AVCaptureSession* captureSession;
@property (nonatomic, retain) AVCaptureConnection* videoCaptureConnection; @property (nonatomic, strong) AVCaptureConnection* videoCaptureConnection;
@property (nonatomic, readonly) BOOL running; @property (nonatomic, readonly) BOOL running;
@property (nonatomic, readonly) BOOL captureSessionLoaded; @property (nonatomic, readonly) BOOL captureSessionLoaded;
@ -80,7 +80,7 @@
@property (nonatomic, assign) int imageWidth; @property (nonatomic, assign) int imageWidth;
@property (nonatomic, assign) int imageHeight; @property (nonatomic, assign) int imageHeight;
@property (nonatomic, retain) UIView* parentView; @property (nonatomic, strong) UIView* parentView;
- (void)start; - (void)start;
- (void)stop; - (void)stop;
@ -138,9 +138,9 @@
@property (nonatomic, assign) BOOL recordVideo; @property (nonatomic, assign) BOOL recordVideo;
@property (nonatomic, assign) BOOL rotateVideo; @property (nonatomic, assign) BOOL rotateVideo;
@property (nonatomic, retain) AVAssetWriterInput* recordAssetWriterInput; @property (nonatomic, strong) AVAssetWriterInput* recordAssetWriterInput;
@property (nonatomic, retain) AVAssetWriterInputPixelBufferAdaptor* recordPixelBufferAdaptor; @property (nonatomic, strong) AVAssetWriterInputPixelBufferAdaptor* recordPixelBufferAdaptor;
@property (nonatomic, retain) AVAssetWriter* recordAssetWriter; @property (nonatomic, strong) AVAssetWriter* recordAssetWriter;
- (void)adjustLayoutToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation; - (void)adjustLayoutToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation;
- (void)layoutPreviewLayer; - (void)layoutPreviewLayer;

2
modules/videoio/src/cap_ios_abstract_camera.mm
View File

@ -37,7 +37,7 @@
@interface CvAbstractCamera () @interface CvAbstractCamera ()
@property (nonatomic, retain) AVCaptureVideoPreviewLayer* captureVideoPreviewLayer; @property (nonatomic, strong) AVCaptureVideoPreviewLayer* captureVideoPreviewLayer;
- (void)deviceOrientationDidChange:(NSNotification*)notification; - (void)deviceOrientationDidChange:(NSNotification*)notification;
- (void)startCaptureSession; - (void)startCaptureSession;

2
modules/videoio/src/cap_ios_photo_camera.mm
View File

@ -37,7 +37,7 @@
@interface CvPhotoCamera () @interface CvPhotoCamera ()
@property (nonatomic, retain) AVCaptureStillImageOutput* stillImageOutput; @property (nonatomic, strong) AVCaptureStillImageOutput* stillImageOutput;
@end @end

4
modules/videoio/src/cap_ios_video_camera.mm
View File

@ -49,8 +49,8 @@ static CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;}
- (void)createVideoFileOutput; - (void)createVideoFileOutput;
@property (nonatomic, retain) CALayer *customPreviewLayer; @property (nonatomic, strong) CALayer *customPreviewLayer;
@property (nonatomic, retain) AVCaptureVideoDataOutput *videoDataOutput; @property (nonatomic, strong) AVCaptureVideoDataOutput *videoDataOutput;
@end @end