From f1dcf71dd7022f3e0440a21ecbaf3612965ed1e5 Mon Sep 17 00:00:00 2001
From: Valeriy Van <github@w7software.com>
Date: Wed, 14 Sep 2016 14:48:41 +0300
Subject: [PATCH] Merge pull request #7178 from valeriyvan:iosfixes

* Changes delegate property from assign to weak

In modern Objective-C delegate should be weak. In very rare conditions you might want delegate be strong.
Assign for delegate is sign of legacy code.
This change prevents crash when you forget nil delegate in dealloc and makes rush with nilling delegate unnecessary.
This change shouldn't break any existing code.

* Adds implementation for setters and getters for weak delegate properties for non ARC Obj-C files

For whatever reason compiler can't synthesize these.
And yes, it's time to convert all Objective-C stuff to ARC.
---
 .../videoio/include/opencv2/videoio/cap_ios.h  |  4 ++--
 modules/videoio/src/cap_ios_photo_camera.mm    | 15 +++++++++++----
 modules/videoio/src/cap_ios_video_camera.mm    | 18 +++++++++++++-----
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/modules/videoio/include/opencv2/videoio/cap_ios.h b/modules/videoio/include/opencv2/videoio/cap_ios.h
index 9075fe1c80..13bf4b987c 100644
--- a/modules/videoio/include/opencv2/videoio/cap_ios.h
+++ b/modules/videoio/include/opencv2/videoio/cap_ios.h
@@ -133,7 +133,7 @@
 
 }
 
-@property (nonatomic, assign) id<CvVideoCameraDelegate> delegate;
+@property (nonatomic, weak) id<CvVideoCameraDelegate> delegate;
 @property (nonatomic, assign) BOOL grayscaleMode;
 
 @property (nonatomic, assign) BOOL recordVideo;
@@ -167,7 +167,7 @@
     AVCaptureStillImageOutput *stillImageOutput;
 }
 
-@property (nonatomic, assign) id<CvPhotoCameraDelegate> delegate;
+@property (nonatomic, weak) id<CvPhotoCameraDelegate> delegate;
 
 - (void)takePicture;
 
diff --git a/modules/videoio/src/cap_ios_photo_camera.mm b/modules/videoio/src/cap_ios_photo_camera.mm
index 8cf19226b6..9b44156efc 100644
--- a/modules/videoio/src/cap_ios_photo_camera.mm
+++ b/modules/videoio/src/cap_ios_photo_camera.mm
@@ -36,6 +36,9 @@
 
 
 @interface CvPhotoCamera ()
+{
+    id<CvPhotoCameraDelegate> _delegate;
+}
 
 @property (nonatomic, strong) AVCaptureStillImageOutput* stillImageOutput;
 
@@ -53,8 +56,14 @@
 #pragma mark Public
 
 @synthesize stillImageOutput;
-@synthesize delegate;
 
+- (void)setDelegate:(id<CvPhotoCameraDelegate>)newDelegate {
+    _delegate = newDelegate;
+}
+
+- (id<CvPhotoCameraDelegate>)delegate {
+    return _delegate;
+}
 
 #pragma mark - Public interface
 
@@ -106,9 +115,7 @@
                  cameraAvailable = YES;
 
                  NSLog(@"CvPhotoCamera captured image");
-                 if (self.delegate) {
-                     [self.delegate photoCamera:self capturedImage:newImage];
-                 }
+                 [self.delegate photoCamera:self capturedImage:newImage];
 
                  [self.captureSession startRunning];
              });
diff --git a/modules/videoio/src/cap_ios_video_camera.mm b/modules/videoio/src/cap_ios_video_camera.mm
index c1a0b4d774..c3704a1f44 100644
--- a/modules/videoio/src/cap_ios_video_camera.mm
+++ b/modules/videoio/src/cap_ios_video_camera.mm
@@ -61,11 +61,12 @@ static CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;}
 
 
 @implementation CvVideoCamera
+{
+    id<CvVideoCameraDelegate> _delegate;
+}
 
 
 
-
-@synthesize delegate;
 @synthesize grayscaleMode;
 
 @synthesize customPreviewLayer;
@@ -78,7 +79,13 @@ static CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;}
 @synthesize recordPixelBufferAdaptor;
 @synthesize recordAssetWriter;
 
+- (void)setDelegate:(id<CvVideoCameraDelegate>)newDelegate {
+    _delegate = newDelegate;
+}
 
+- (id<CvVideoCameraDelegate>)delegate {
+    return _delegate;
+}
 
 #pragma mark - Constructors
 
@@ -450,7 +457,8 @@ static CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;}
 {
     (void)captureOutput;
     (void)connection;
-    if (self.delegate) {
+    auto strongDelegate = self.delegate;
+    if (strongDelegate) {
 
         // convert from Core Media to Core Video
         CVImageBufferRef imageBuffer = CMSampleBufferGetImageBuffer(sampleBuffer);
@@ -492,8 +500,8 @@ static CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;}
 
         CGImage* dstImage;
 
-        if ([self.delegate respondsToSelector:@selector(processImage:)]) {
-            [self.delegate processImage:image];
+        if ([strongDelegate respondsToSelector:@selector(processImage:)]) {
+            [strongDelegate processImage:image];
         }
 
         // check if matrix data pointer or dimensions were changed by the delegate
-- 
GitLab