From 31e790da33765a4ba86ae79726f9a3cb56b1ff9e Mon Sep 17 00:00:00 2001 From: Valeriy Van Date: Sun, 28 Aug 2016 12:29:58 +0300 Subject: [PATCH 1/3] Fixes spelling in NSLog --- modules/videoio/src/cap_ios_abstract_camera.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/videoio/src/cap_ios_abstract_camera.mm b/modules/videoio/src/cap_ios_abstract_camera.mm index 5c870a7604..702b1f2107 100644 --- a/modules/videoio/src/cap_ios_abstract_camera.mm +++ b/modules/videoio/src/cap_ios_abstract_camera.mm @@ -333,7 +333,7 @@ device.focusMode = AVCaptureFocusModeContinuousAutoFocus; [device unlockForConfiguration]; } else { - NSLog(@"unable to lock device for autofocos configuration %@", [error localizedDescription]); + NSLog(@"unable to lock device for autofocus configuration %@", [error localizedDescription]); } } [self.captureSession addInput:input]; From 517be4bfa96277a89fea4b2fbf8b46c457833639 Mon Sep 17 00:00:00 2001 From: Valeriy Van Date: Sun, 28 Aug 2016 12:34:50 +0300 Subject: [PATCH 2/3] Changes [error localizedDescription] for [error description] in NSLog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There's no sense to log error messages in user’s locale. Imagine you’re trying to guess what's going on decrypting logs in hebrew, arabic, slavic. localizedDescription is for end user messages, not for logs. --- modules/videoio/src/cap_ios_abstract_camera.mm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/videoio/src/cap_ios_abstract_camera.mm b/modules/videoio/src/cap_ios_abstract_camera.mm index 702b1f2107..425032c6e0 100644 --- a/modules/videoio/src/cap_ios_abstract_camera.mm +++ b/modules/videoio/src/cap_ios_abstract_camera.mm @@ -323,7 +323,7 @@ NSError* error = nil; AVCaptureDeviceInput *input = [AVCaptureDeviceInput deviceInputWithDevice:device error:&error]; if (!input) { - NSLog(@"error creating input %@", [error localizedDescription]); + NSLog(@"error creating input %@", [error description]); } // support for autofocus @@ -333,7 +333,7 @@ device.focusMode = AVCaptureFocusModeContinuousAutoFocus; [device unlockForConfiguration]; } else { - NSLog(@"unable to lock device for autofocus configuration %@", [error localizedDescription]); + NSLog(@"unable to lock device for autofocus configuration %@", [error description]); } } [self.captureSession addInput:input]; @@ -436,7 +436,7 @@ device.focusMode = AVCaptureFocusModeLocked; [device unlockForConfiguration]; } else { - NSLog(@"unable to lock device for locked focus configuration %@", [error localizedDescription]); + NSLog(@"unable to lock device for locked focus configuration %@", [error description]); } } } @@ -450,7 +450,7 @@ device.focusMode = AVCaptureFocusModeContinuousAutoFocus; [device unlockForConfiguration]; } else { - NSLog(@"unable to lock device for autofocus configuration %@", [error localizedDescription]); + NSLog(@"unable to lock device for autofocus configuration %@", [error description]); } } } @@ -464,7 +464,7 @@ device.exposureMode = AVCaptureExposureModeLocked; [device unlockForConfiguration]; } else { - NSLog(@"unable to lock device for locked exposure configuration %@", [error localizedDescription]); + NSLog(@"unable to lock device for locked exposure configuration %@", [error description]); } } } @@ -478,7 +478,7 @@ device.exposureMode = AVCaptureExposureModeContinuousAutoExposure; [device unlockForConfiguration]; } else { - NSLog(@"unable to lock device for autoexposure configuration %@", [error localizedDescription]); + NSLog(@"unable to lock device for autoexposure configuration %@", [error description]); } } } @@ -492,7 +492,7 @@ device.whiteBalanceMode = AVCaptureWhiteBalanceModeLocked; [device unlockForConfiguration]; } else { - NSLog(@"unable to lock device for locked white balance configuration %@", [error localizedDescription]); + NSLog(@"unable to lock device for locked white balance configuration %@", [error description]); } } } @@ -506,7 +506,7 @@ device.whiteBalanceMode = AVCaptureWhiteBalanceModeContinuousAutoWhiteBalance; [device unlockForConfiguration]; } else { - NSLog(@"unable to lock device for auto white balance configuration %@", [error localizedDescription]); + NSLog(@"unable to lock device for auto white balance configuration %@", [error description]); } } } From 5a71bde79aecccb4eb4f7bb77f377d9f14f53f9c Mon Sep 17 00:00:00 2001 From: Valeriy Van Date: Sun, 28 Aug 2016 12:48:08 +0300 Subject: [PATCH 3/3] Changes existential NSStringFromSelector(_cmd) for straightforward __FUCNTION__ --- modules/videoio/src/cap_ios_abstract_camera.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/videoio/src/cap_ios_abstract_camera.mm b/modules/videoio/src/cap_ios_abstract_camera.mm index 425032c6e0..79e0c3d7a9 100644 --- a/modules/videoio/src/cap_ios_abstract_camera.mm +++ b/modules/videoio/src/cap_ios_abstract_camera.mm @@ -379,13 +379,13 @@ - (void)createCaptureOutput; { [NSException raise:NSInternalInconsistencyException - format:@"You must override %@ in a subclass", NSStringFromSelector(_cmd)]; + format:@"You must override %s in a subclass", __FUNCTION__]; } - (void)createCustomVideoPreview; { [NSException raise:NSInternalInconsistencyException - format:@"You must override %@ in a subclass", NSStringFromSelector(_cmd)]; + format:@"You must override %s in a subclass", __FUNCTION__]; } - (void)updateOrientation;