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

Cocoa: Simplify qt_mac_cgimage_to_nsimage code

Browse Source 
Since 10.6, NSImage has a sensible contructor for that.

Change-Id: Ie753135ebb37630c1a70c395689bf85d4a4a01de
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
This commit is contained in:
Gabriel de Dietrich 2013-06-27 16:39:05 +02:00 committed by The Qt Project
parent b67f4238b8
commit 0aa0675040
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,16 +124,7 @@ CGImageRef qt_mac_image_to_cgimage(const QImage &img)
NSImage *qt_mac_cgimage_to_nsimage(CGImageRef image) NSImage *qt_mac_cgimage_to_nsimage(CGImageRef image)
{ {
QCocoaAutoReleasePool pool; NSImage *newImage = [[NSImage alloc] initWithCGImage:image size:NSZeroSize];
NSImage *newImage = 0;
NSRect imageRect = NSMakeRect(0.0, 0.0, CGImageGetWidth(image), CGImageGetHeight(image));
newImage = [[NSImage alloc] initWithSize:imageRect.size];
[newImage lockFocus];
{
CGContextRef imageContext = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
CGContextDrawImage(imageContext, *(CGRect*)&imageRect, image);
}
[newImage unlockFocus];
return newImage; return newImage;
} }