Merge pull request #4115 from themightyoarfish:MatToUIImage_transparency

2015-06-17 11:59:33 +00:00
parent e055128d0d 125782c061
commit bf8434770f
1 changed files with 5 additions and 2 deletions
--- a/modules/imgcodecs/src/ios_conversions.mm
+++ b/modules/imgcodecs/src/ios_conversions.mm
@@ -66,6 +66,10 @@ UIImage* MatToUIImage(const cv::Mat& image) {
    CGDataProviderRef provider =
            CGDataProviderCreateWithCFData((__bridge CFDataRef)data);

+    // Preserve alpha transparency, if exists
+    bool alpha = image.channels() == 4;
+    CGBitmapInfo bitmapInfo = (alpha ? kCGImageAlphaLast : kCGImageAlphaNone) | kCGBitmapByteOrderDefault;
+
    // Creating CGImage from cv::Mat
    CGImageRef imageRef = CGImageCreate(image.cols,
                                        image.rows,
@@ -73,8 +77,7 @@ UIImage* MatToUIImage(const cv::Mat& image) {
                                        8 * image.elemSize(),
                                        image.step.p[0],
                                        colorSpace,
-                                        kCGImageAlphaNone|
-                                        kCGBitmapByteOrderDefault,
+                                        bitmapInfo,
                                        provider,
                                        NULL,
                                        false,