From 7405075ede6490192404b2bf3609bdddf65181bf Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Fri, 5 Feb 2021 23:24:56 -0500 Subject: [PATCH] CHange import order to avoid apple check error --- modules/imgcodecs/src/apple_conversions.h | 2 +- modules/imgcodecs/src/macosx_conversions.mm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/imgcodecs/src/apple_conversions.h b/modules/imgcodecs/src/apple_conversions.h index 27e8955bfc..c68b922cfb 100644 --- a/modules/imgcodecs/src/apple_conversions.h +++ b/modules/imgcodecs/src/apple_conversions.h @@ -2,10 +2,10 @@ // It is subject to the license terms in the LICENSE file found in the top-level directory // of this distribution and at http://opencv.org/license.html. +#include "opencv2/core.hpp" #import #import #import -#include "opencv2/core.hpp" CV_EXPORTS CGImageRef MatToCGImage(const cv::Mat& image) CF_RETURNS_RETAINED; CV_EXPORTS void CGImageToMat(const CGImageRef image, cv::Mat& m, bool alphaExist); diff --git a/modules/imgcodecs/src/macosx_conversions.mm b/modules/imgcodecs/src/macosx_conversions.mm index c1827e71f1..0023e06260 100644 --- a/modules/imgcodecs/src/macosx_conversions.mm +++ b/modules/imgcodecs/src/macosx_conversions.mm @@ -2,8 +2,8 @@ // It is subject to the license terms in the LICENSE file found in the top-level directory // of this distribution and at http://opencv.org/license.html. -#import #include "apple_conversions.h" +#import CV_EXPORTS NSImage* MatToNSImage(const cv::Mat& image); CV_EXPORTS void NSImageToMat(const NSImage* image, cv::Mat& m, bool alphaExist); -- GitLab