Merge pull request #12263 from doctorcolinsmith:3.4

pull/12262/head
Alexander Alekhin 7 years ago
commit 10c570b558
  1. 4
      modules/imgcodecs/include/opencv2/imgcodecs/ios.h
  2. 4
      modules/imgcodecs/src/ios_conversions.mm

@ -50,8 +50,8 @@
//! @addtogroup imgcodecs_ios //! @addtogroup imgcodecs_ios
//! @{ //! @{
UIImage* MatToUIImage(const cv::Mat& image); CV_EXPORTS UIImage* MatToUIImage(const cv::Mat& image);
void UIImageToMat(const UIImage* image, CV_EXPORTS void UIImageToMat(const UIImage* image,
cv::Mat& m, bool alphaExist = false); cv::Mat& m, bool alphaExist = false);
//! @} //! @}

@ -47,8 +47,8 @@
#include "opencv2/core.hpp" #include "opencv2/core.hpp"
#include "precomp.hpp" #include "precomp.hpp"
UIImage* MatToUIImage(const cv::Mat& image); CV_EXPORTS UIImage* MatToUIImage(const cv::Mat& image);
void UIImageToMat(const UIImage* image, cv::Mat& m, bool alphaExist); CV_EXPORTS void UIImageToMat(const UIImage* image, cv::Mat& m, bool alphaExist);
UIImage* MatToUIImage(const cv::Mat& image) { UIImage* MatToUIImage(const cv::Mat& image) {

Loading…
Cancel
Save