Skip to content

O
opencv
Commit cc529d97 authored by Alexander Shishkov's avatar Alexander Shishkov
Browse files
Options

removed tabs

parent 9a98cd6e
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 17 deletions
modules/highgui/src/cap_ios_abstract_camera.mm
View file @ cc529d97
...@@ -279,20 +279,20 @@ ...@@ -279,20 +279,20 @@
self.captureVideoPreviewLayer = [[AVCaptureVideoPreviewLayer alloc] initWithSession:self.captureSession]; self.captureVideoPreviewLayer = [[AVCaptureVideoPreviewLayer alloc] initWithSession:self.captureSession];
if ([self.captureVideoPreviewLayer respondsToSelector:@selector(connection)]) if ([self.captureVideoPreviewLayer respondsToSelector:@selector(connection)])
{ {
if ([self.captureVideoPreviewLayer.connection isVideoOrientationSupported]) if ([self.captureVideoPreviewLayer.connection isVideoOrientationSupported])
{ {
[self.captureVideoPreviewLayer.connection setVideoOrientation:self.defaultAVCaptureVideoOrientation]; [self.captureVideoPreviewLayer.connection setVideoOrientation:self.defaultAVCaptureVideoOrientation];
} }
} }
else else
{ {
// Deprecated in 6.0; here for backward compatibility // Deprecated in 6.0; here for backward compatibility
if ([self.captureVideoPreviewLayer isOrientationSupported]) if ([self.captureVideoPreviewLayer isOrientationSupported])
{ {
[self.captureVideoPreviewLayer setOrientation:self.defaultAVCaptureVideoOrientation]; [self.captureVideoPreviewLayer setOrientation:self.defaultAVCaptureVideoOrientation];
} }
} }
if (parentView != nil) { if (parentView != nil) {
self.captureVideoPreviewLayer.frame = self.parentView.bounds; self.captureVideoPreviewLayer.frame = self.parentView.bounds;
...@@ -302,9 +302,6 @@ ...@@ -302,9 +302,6 @@
NSLog(@"[Camera] created AVCaptureVideoPreviewLayer"); NSLog(@"[Camera] created AVCaptureVideoPreviewLayer");
} }
- (void)setDesiredCameraPosition:(AVCaptureDevicePosition)desiredPosition; - (void)setDesiredCameraPosition:(AVCaptureDevicePosition)desiredPosition;
{ {
for (AVCaptureDevice *device in [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo]) { for (AVCaptureDevice *device in [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo]) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment