build: fix warnings about TARGET_OS_MACCATALYST

98611ade · Alexander Alekhin · 2b2bcc9b · 98611ade · 98611ade
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

modules/videoio/src/cap_avfoundation.mm modules/videoio/src/cap_avfoundation.mm +1 -1

modules/videoio/src/cap_ios_abstract_camera.mm modules/videoio/src/cap_ios_abstract_camera.mm +1 -1

未找到文件。
--- a/modules/videoio/src/cap_avfoundation.mm
+++ b/modules/videoio/src/cap_avfoundation.mm
@@ -383,7 +383,7 @@ int CvCaptureCAM::startCaptureDevice(int cameraNum) {
        [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


--- a/modules/videoio/src/cap_ios_abstract_camera.mm
+++ b/modules/videoio/src/cap_ios_abstract_camera.mm
@@ -299,7 +299,7 @@
    }
    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])
        {