AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set CGImage format when converting from QImage.

Browse Source 
Set the CGImage format based on QImage::format().
Handle8-bit per component (A)RGB.

Change-Id: I041b0ee53d3943a0aaf9e813eb0a235c4de619dd
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
This commit is contained in:
Morten Johan Sorvig 2012-12-04 17:02:59 +01:00 committed by The Qt Project
parent 2e14214357
commit 13fcd1c342
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/platforms/cocoa/qcocoahelpers.mm
View File

@ -804,13 +804,34 @@ CGImageRef qt_mac_toCGImage(const QImage &qImage, bool isMask, uchar **dataCopy)
if (!cgColourSpaceRef)
cgColourSpaceRef = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
// Create a CGBitmapInfo contiaining the image format.
// Support the 8-bit per component (A)RGB formats.
CGBitmapInfo bitmapInfo = kCGBitmapByteOrder32Little;
switch (qImage.format()) {
case QImage::Format_ARGB32_Premultiplied :
bitmapInfo |= kCGImageAlphaPremultipliedFirst;
break;
case QImage::Format_ARGB32 :
bitmapInfo |= kCGImageAlphaFirst;
break;
case QImage::Format_RGB32 :
bitmapInfo |= kCGImageAlphaNoneSkipFirst;
break;
case QImage::Format_RGB888 :
bitmapInfo |= kCGImageAlphaNone;
break;
default:
qWarning() << "qt_mac_toCGImage: Unsupported image format" << qImage.format();
break;
}
cgImage = CGImageCreate(width,
height,
colorBufferSize,
bitDepth,
bytesPrLine,
cgColourSpaceRef,
kCGBitmapByteOrder32Little | kCGImageAlphaNoneSkipFirst,
bitmapInfo,
cgDataProviderRef,
NULL,
false,