Merge pull request #7122 from haikusw:UIImageAlphaToMatFix

5903c725 · Vadim Pisarevsky · bf4c5bef · ca318e70 · 5903c725
Commit 5903c725 authored Aug 20, 2016 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

ios_conversions.mm modules/imgcodecs/src/ios_conversions.mm +4 -0

No files found.
--- a/modules/imgcodecs/src/ios_conversions.mm
+++ b/modules/imgcodecs/src/ios_conversions.mm
@@ -106,6 +106,8 @@ void UIImageToMat(const UIImage* image,
        bitmapInfo = kCGImageAlphaNone;
        if (!alphaExist)
            bitmapInfo = kCGImageAlphaNone;
+        else
+            m = cv::Scalar(0);
        contextRef = CGBitmapContextCreate(m.data, m.cols, m.rows, 8,
                                           m.step[0], colorSpace,
                                           bitmapInfo);
@@ -116,6 +118,8 @@ void UIImageToMat(const UIImage* image,
        if (!alphaExist)
            bitmapInfo = kCGImageAlphaNoneSkipLast |
                                kCGBitmapByteOrderDefault;
+        else
+            m = cv::Scalar(0);
        contextRef = CGBitmapContextCreate(m.data, m.cols, m.rows, 8,
                                           m.step[0], colorSpace,
                                           bitmapInfo);