mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 11:40:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #17345 from alalek:build_fix_mac_warnings

Browse Source
This commit is contained in:
Alexander Alekhin 2020-05-22 10:50:41 +00:00
commit d4a9c731ff
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -383,7 +383,7 @@ int CvCaptureCAM::startCaptureDevice(int cameraNum) {
[mCaptureDecompressedVideoOutput setVideoSettings:pixelBufferOptions]; [mCaptureDecompressedVideoOutput setVideoSettings:pixelBufferOptions];
mCaptureDecompressedVideoOutput.alwaysDiscardsLateVideoFrames = YES; mCaptureDecompressedVideoOutput.alwaysDiscardsLateVideoFrames = YES;
#if (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR) && !TARGET_OS_MACCATALYST #if (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR) && (!defined(TARGET_OS_MACCATALYST) || !TARGET_OS_MACCATALYST)
mCaptureDecompressedVideoOutput.minFrameDuration = CMTimeMake(1, 30); mCaptureDecompressedVideoOutput.minFrameDuration = CMTimeMake(1, 30);
#endif #endif

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

@ -299,7 +299,7 @@
} }
else else
{ {
#if !TARGET_OS_MACCATALYST #if (!defined(TARGET_OS_MACCATALYST) || !TARGET_OS_MACCATALYST)
// Deprecated in 6.0; here for backward compatibility // Deprecated in 6.0; here for backward compatibility
if ([self.captureVideoPreviewLayer isOrientationSupported]) if ([self.captureVideoPreviewLayer isOrientationSupported])
{ {