Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use built-in that exists since 10.6

Browse Source
This commit is contained in:
Stefan Csomor
2017-06-01 15:10:09 +02:00
parent ad96f4be55
commit 6a3b936d0f
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/osx/carbon/utilscocoa.mm
View File

@@ -403,7 +403,6 @@ wxBitmap wxOSXCreateSystemBitmap(const wxString& name, const wxString &WXUNUSED(
return wxBitmap( [NSImage imageNamed:cfname.AsNSString()] ); return wxBitmap( [NSImage imageNamed:cfname.AsNSString()] );
} }
// From "Cocoa Drawing Guide:Working with Images"
WX_NSImage wxOSXGetNSImageFromCGImage( CGImageRef image, double scaleFactor, bool isTemplate ) WX_NSImage wxOSXGetNSImageFromCGImage( CGImageRef image, double scaleFactor, bool isTemplate )
{ {
NSRect imageRect = NSMakeRect(0.0, 0.0, 0.0, 0.0); NSRect imageRect = NSMakeRect(0.0, 0.0, 0.0, 0.0);
@@ -412,25 +411,10 @@ WX_NSImage wxOSXGetNSImageFromCGImage( CGImageRef image, double scaleFactor, bo
imageRect.size.height = CGImageGetHeight(image)/scaleFactor; imageRect.size.height = CGImageGetHeight(image)/scaleFactor;
imageRect.size.width = CGImageGetWidth(image)/scaleFactor; imageRect.size.width = CGImageGetWidth(image)/scaleFactor;
// Create a new image to receive the Quartz image data. NSImage* newImage = [[NSImage alloc] initWithCGImage:image size:imageRect.size];
NSImage *newImage = [[NSImage alloc] initWithSize:imageRect.size];
[newImage lockFocus];
// Get the Quartz context and draw.
CGContextRef imageContext = (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort];
CGContextDrawImage( imageContext, *(CGRect*)&imageRect, image );
[newImage unlockFocus];
[newImage setTemplate:isTemplate]; [newImage setTemplate:isTemplate];
/*
// Create a bitmap rep from the image...
NSBitmapImageRep *bitmapRep = [[NSBitmapImageRep alloc] initWithCGImage:cgImage];
// Create an NSImage and add the bitmap rep to it...
NSImage *image = [[NSImage alloc] init];
[image addRepresentation:bitmapRep];
[bitmapRep release];
*/
[newImage autorelease]; [newImage autorelease];
return( newImage ); return( newImage );
} }