Merge pull request #19468 from hmaarrfk:fix_apple_check

pull/19398/head
Alexander Alekhin 4 years ago
commit 0c31c0756c
  1. 2
      modules/imgcodecs/src/apple_conversions.h
  2. 2
      modules/imgcodecs/src/macosx_conversions.mm

@ -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 <Accelerate/Accelerate.h>
#import <AVFoundation/AVFoundation.h>
#import <ImageIO/ImageIO.h>
#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);

@ -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 <AppKit/AppKit.h>
#include "apple_conversions.h"
#import <AppKit/AppKit.h>
CV_EXPORTS NSImage* MatToNSImage(const cv::Mat& image);
CV_EXPORTS void NSImageToMat(const NSImage* image, cv::Mat& m, bool alphaExist);

Loading…
Cancel
Save