Skip to content

Commit 0c31c07

Browse files
committed
Merge pull request opencv#19468 from hmaarrfk:fix_apple_check
2 parents 6b474c4 + 7405075 commit 0c31c07

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

modules/imgcodecs/src/apple_conversions.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
// It is subject to the license terms in the LICENSE file found in the top-level directory
33
// of this distribution and at http://opencv.org/license.html.
44

5+
#include "opencv2/core.hpp"
56
#import <Accelerate/Accelerate.h>
67
#import <AVFoundation/AVFoundation.h>
78
#import <ImageIO/ImageIO.h>
8-
#include "opencv2/core.hpp"
99

1010
CV_EXPORTS CGImageRef MatToCGImage(const cv::Mat& image) CF_RETURNS_RETAINED;
1111
CV_EXPORTS void CGImageToMat(const CGImageRef image, cv::Mat& m, bool alphaExist);

modules/imgcodecs/src/macosx_conversions.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// It is subject to the license terms in the LICENSE file found in the top-level directory
33
// of this distribution and at http://opencv.org/license.html.
44

5-
#import <AppKit/AppKit.h>
65
#include "apple_conversions.h"
6+
#import <AppKit/AppKit.h>
77

88
CV_EXPORTS NSImage* MatToNSImage(const cv::Mat& image);
99
CV_EXPORTS void NSImageToMat(const NSImage* image, cv::Mat& m, bool alphaExist);

0 commit comments

Comments
 (0)