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

using newer API

Browse Source
This commit is contained in:
Stefan Csomor
2018-09-20 20:55:00 +02:00
committed by Vadim Zeitlin
parent 88a15bea48
commit 3e6d927eab
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -302,22 +302,13 @@ CGSize wxOSXGetImageSize(WX_NSImage image)
CGImageRef wxOSXCreateCGImageFromNSImage( WX_NSImage nsimage, double *scaleptr ) CGImageRef wxOSXCreateCGImageFromNSImage( WX_NSImage nsimage, double *scaleptr )
{ {
// based on http://www.mail-archive.com/cocoa-dev@lists.apple.com/msg18065.html
CGImageRef image = NULL; CGImageRef image = NULL;
if (nsimage != nil) if (nsimage != nil)
{ {
CGContextRef context = wxOSXCreateBitmapContextFromNSImage(nsimage); image = [nsimage CGImageForProposedRect:nil context:nil hints:nil];
CFRetain(image);
if ( scaleptr ) if ( scaleptr )
{ *scaleptr = CGImageGetWidth(image)/[nsimage size].width;
// determine content scale
CGRect userrect = CGRectMake(0, 0, 10, 10);
CGRect devicerect;
devicerect = CGContextConvertRectToDeviceSpace(context, userrect);
*scaleptr = devicerect.size.height / userrect.size.height;
}
image = CGBitmapContextCreateImage(context);
CFRelease(context);
} }
return image; return image;
} }