From 874fb7ae78e64e5f0482954933f2b08caa2b48b3 Mon Sep 17 00:00:00 2001
From: Chaoshuai Lu <lcs@Chaoshuais-Pro.dhcp.thefacebook.com>
Date: Wed, 22 Mar 2017 22:04:27 -0700
Subject: [PATCH] Fix MatToUIImage method crash when the step is not equal to
 cols * elemSize()

---
 modules/imgcodecs/src/ios_conversions.mm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/imgcodecs/src/ios_conversions.mm b/modules/imgcodecs/src/ios_conversions.mm
index eed867a790..2db873acd0 100644
--- a/modules/imgcodecs/src/ios_conversions.mm
+++ b/modules/imgcodecs/src/ios_conversions.mm
@@ -53,7 +53,7 @@ void UIImageToMat(const UIImage* image, cv::Mat& m, bool alphaExist);
 UIImage* MatToUIImage(const cv::Mat& image) {
 
     NSData *data = [NSData dataWithBytes:image.data
-                                  length:image.elemSize()*image.total()];
+                                  length:image.step.p[0] * image.rows];
 
     CGColorSpaceRef colorSpace;
 
@@ -73,7 +73,7 @@ UIImage* MatToUIImage(const cv::Mat& image) {
     // Creating CGImage from cv::Mat
     CGImageRef imageRef = CGImageCreate(image.cols,
                                         image.rows,
-                                        8,
+                                        8 * image.elemSize1(),
                                         8 * image.elemSize(),
                                         image.step.p[0],
                                         colorSpace,
-- 
GitLab