From f1db065c10eb6be75fdb08ae50264b1481eb49f5 Mon Sep 17 00:00:00 2001 From: Valeriy Van Date: Thu, 25 Aug 2016 21:40:16 +0300 Subject: [PATCH] Unifies Obj-C property attributes changing retain to strong strong and retain are synonymous but using strong along with obsolete synonym retain in one file is negligent --- modules/videoio/include/opencv2/videoio/cap_ios.h | 12 ++++++------ modules/videoio/src/cap_ios_abstract_camera.mm | 2 +- modules/videoio/src/cap_ios_photo_camera.mm | 2 +- modules/videoio/src/cap_ios_video_camera.mm | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/videoio/include/opencv2/videoio/cap_ios.h b/modules/videoio/include/opencv2/videoio/cap_ios.h index 1a9875b..9075fe1 100644 --- a/modules/videoio/include/opencv2/videoio/cap_ios.h +++ b/modules/videoio/include/opencv2/videoio/cap_ios.h @@ -64,8 +64,8 @@ int imageHeight; } -@property (nonatomic, retain) AVCaptureSession* captureSession; -@property (nonatomic, retain) AVCaptureConnection* videoCaptureConnection; +@property (nonatomic, strong) AVCaptureSession* captureSession; +@property (nonatomic, strong) AVCaptureConnection* videoCaptureConnection; @property (nonatomic, readonly) BOOL running; @property (nonatomic, readonly) BOOL captureSessionLoaded; @@ -80,7 +80,7 @@ @property (nonatomic, assign) int imageWidth; @property (nonatomic, assign) int imageHeight; -@property (nonatomic, retain) UIView* parentView; +@property (nonatomic, strong) UIView* parentView; - (void)start; - (void)stop; @@ -138,9 +138,9 @@ @property (nonatomic, assign) BOOL recordVideo; @property (nonatomic, assign) BOOL rotateVideo; -@property (nonatomic, retain) AVAssetWriterInput* recordAssetWriterInput; -@property (nonatomic, retain) AVAssetWriterInputPixelBufferAdaptor* recordPixelBufferAdaptor; -@property (nonatomic, retain) AVAssetWriter* recordAssetWriter; +@property (nonatomic, strong) AVAssetWriterInput* recordAssetWriterInput; +@property (nonatomic, strong) AVAssetWriterInputPixelBufferAdaptor* recordPixelBufferAdaptor; +@property (nonatomic, strong) AVAssetWriter* recordAssetWriter; - (void)adjustLayoutToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation; - (void)layoutPreviewLayer; diff --git a/modules/videoio/src/cap_ios_abstract_camera.mm b/modules/videoio/src/cap_ios_abstract_camera.mm index e580f24..5c870a7 100644 --- a/modules/videoio/src/cap_ios_abstract_camera.mm +++ b/modules/videoio/src/cap_ios_abstract_camera.mm @@ -37,7 +37,7 @@ @interface CvAbstractCamera () -@property (nonatomic, retain) AVCaptureVideoPreviewLayer* captureVideoPreviewLayer; +@property (nonatomic, strong) AVCaptureVideoPreviewLayer* captureVideoPreviewLayer; - (void)deviceOrientationDidChange:(NSNotification*)notification; - (void)startCaptureSession; diff --git a/modules/videoio/src/cap_ios_photo_camera.mm b/modules/videoio/src/cap_ios_photo_camera.mm index c6c93a8..8cf1922 100644 --- a/modules/videoio/src/cap_ios_photo_camera.mm +++ b/modules/videoio/src/cap_ios_photo_camera.mm @@ -37,7 +37,7 @@ @interface CvPhotoCamera () -@property (nonatomic, retain) AVCaptureStillImageOutput* stillImageOutput; +@property (nonatomic, strong) AVCaptureStillImageOutput* stillImageOutput; @end diff --git a/modules/videoio/src/cap_ios_video_camera.mm b/modules/videoio/src/cap_ios_video_camera.mm index ee074af..c1a0b4d 100644 --- a/modules/videoio/src/cap_ios_video_camera.mm +++ b/modules/videoio/src/cap_ios_video_camera.mm @@ -49,8 +49,8 @@ static CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;} - (void)createVideoFileOutput; -@property (nonatomic, retain) CALayer *customPreviewLayer; -@property (nonatomic, retain) AVCaptureVideoDataOutput *videoDataOutput; +@property (nonatomic, strong) CALayer *customPreviewLayer; +@property (nonatomic, strong) AVCaptureVideoDataOutput *videoDataOutput; @end -- 2.7.4