Merge pull request #12263 from doctorcolinsmith:3.4

7 years ago · 10c570b558
parent 3c03fb56e0 76f47548b3
commit 10c570b558
2 changed files with 5 additions and 5 deletions
--- a/modules/imgcodecs/include/opencv2/imgcodecs/ios.h
+++ b/modules/imgcodecs/include/opencv2/imgcodecs/ios.h
@ -50,8 +50,8 @@
 //! @addtogroup imgcodecs_ios
 //! @{

-UIImage* MatToUIImage(const cv::Mat& image);
-void UIImageToMat(const UIImage* image,
-                         cv::Mat& m, bool alphaExist = false);
+CV_EXPORTS UIImage* MatToUIImage(const cv::Mat& image);
+CV_EXPORTS void UIImageToMat(const UIImage* image,
+                             cv::Mat& m, bool alphaExist = false);

 //! @}
--- a/modules/imgcodecs/src/ios_conversions.mm
+++ b/modules/imgcodecs/src/ios_conversions.mm
@ -47,8 +47,8 @@
 #include "opencv2/core.hpp"
 #include "precomp.hpp"

-UIImage* MatToUIImage(const cv::Mat& image);
-void UIImageToMat(const UIImage* image, cv::Mat& m, bool alphaExist);
+CV_EXPORTS UIImage* MatToUIImage(const cv::Mat& image);
+CV_EXPORTS void UIImageToMat(const UIImage* image, cv::Mat& m, bool alphaExist);

 UIImage* MatToUIImage(const cv::Mat& image) {