third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8437 from matrush:master

Browse Source
This commit is contained in:
Vadim Pisarevsky 2017-03-23 12:47:54 +00:00
commit 9ac34bd2c4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/imgcodecs/src/ios_conversions.mm
View File

@ -53,7 +53,7 @@ void UIImageToMat(const UIImage* image, cv::Mat& m, bool alphaExist);
UIImage* MatToUIImage(const cv::Mat& image) { UIImage* MatToUIImage(const cv::Mat& image) {
NSData *data = [NSData dataWithBytes:image.data NSData *data = [NSData dataWithBytes:image.data
length:image.elemSize()*image.total()]; length:image.step.p[0] * image.rows];
CGColorSpaceRef colorSpace; CGColorSpaceRef colorSpace;
@ -73,7 +73,7 @@ UIImage* MatToUIImage(const cv::Mat& image) {
// Creating CGImage from cv::Mat // Creating CGImage from cv::Mat
CGImageRef imageRef = CGImageCreate(image.cols, CGImageRef imageRef = CGImageCreate(image.cols,
image.rows, image.rows,
8, 8 * image.elemSize1(),
8 * image.elemSize(), 8 * image.elemSize(),
image.step.p[0], image.step.p[0],
colorSpace, colorSpace,
@ -97,7 +97,7 @@ UIImage* MatToUIImage(const cv::Mat& image) {
void UIImageToMat(const UIImage* image, void UIImageToMat(const UIImage* image,
cv::Mat& m, bool alphaExist) { cv::Mat& m, bool alphaExist) {
CGColorSpaceRef colorSpace = CGImageGetColorSpace(image.CGImage); CGColorSpaceRef colorSpace = CGImageGetColorSpace(image.CGImage);
CGFloat cols = image.size.width, rows = image.size.height; CGFloat cols = CGImageGetWidth(image.CGImage), rows = CGImageGetHeight(image.CGImage);
CGContextRef contextRef; CGContextRef contextRef;
CGBitmapInfo bitmapInfo = kCGImageAlphaPremultipliedLast; CGBitmapInfo bitmapInfo = kCGImageAlphaPremultipliedLast;
if (CGColorSpaceGetModel(colorSpace) == kCGColorSpaceModelMonochrome) if (CGColorSpaceGetModel(colorSpace) == kCGColorSpaceModelMonochrome)