Merge pull request opencv#17345 from alalek:build_fix_mac_warnings

alalek · alalek · commit d4a9c731ff3d · 2020-05-22T10:50:41.000Z
diff --git a/modules/videoio/src/cap_avfoundation.mm b/modules/videoio/src/cap_avfoundation.mm
@@ -383,7 +383,7 @@ - (IplImage*)getOutput;
         [mCaptureDecompressedVideoOutput setVideoSettings:pixelBufferOptions];
         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);
 #endif
 
diff --git a/modules/videoio/src/cap_ios_abstract_camera.mm b/modules/videoio/src/cap_ios_abstract_camera.mm
@@ -299,7 +299,7 @@ - (void)createVideoPreviewLayer;
     }
     else
     {
-#if !TARGET_OS_MACCATALYST
+#if (!defined(TARGET_OS_MACCATALYST) || !TARGET_OS_MACCATALYST)
         // Deprecated in 6.0; here for backward compatibility
         if ([self.captureVideoPreviewLayer isOrientationSupported])
         {

Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ - (void)createVideoPreviewLayer;`
`299`	`299`	`}`
`300`	`300`	`else`
`301`	`301`	`{`
`302`		`-#if !TARGET_OS_MACCATALYST`
	`302`	`+#if (!defined(TARGET_OS_MACCATALYST) \|\| !TARGET_OS_MACCATALYST)`
`303`	`303`	`// Deprecated in 6.0; here for backward compatibility`
`304`	`304`	`if ([self.captureVideoPreviewLayer isOrientationSupported])`
`305`	`305`	`{`