dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use QPixmap::toImage() and QImage.toCGImage() instead

Browse Source
This commit is contained in:
Jonas Kvinge
2019-08-16 22:26:30 +02:00
parent 4dccb40bf9
commit a33e6c03e4
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/widgets/qocoa_mac.h
View File

@@ -22,9 +22,11 @@ THE SOFTWARE.
#include <AppKit/NSImage.h> #include <AppKit/NSImage.h>
#include <Foundation/NSString.h> #include <Foundation/NSString.h>
#include <QByteArray>
#include <QString> #include <QString>
#include <QImage>
#include <QPixmap>
#include <QBoxLayout> #include <QBoxLayout>
#include <QtMacExtras>
#include <QMacCocoaViewContainer> #include <QMacCocoaViewContainer>
static inline NSString* fromQString(const QString &string) { static inline NSString* fromQString(const QString &string) {
@@ -44,7 +46,8 @@ static inline QString toQString(NSString *string) {
static inline NSImage* fromQPixmap(const QPixmap &pixmap) { static inline NSImage* fromQPixmap(const QPixmap &pixmap) {
CGImageRef cgImage = QtMac::toCGImageRef(pixmap); QImage image = pixmap.toImage();
CGImageRef cgImage = image.toCGImage();
return [ [NSImage alloc] initWithCGImage:cgImage size:NSZeroSize]; return [ [NSImage alloc] initWithCGImage:cgImage size:NSZeroSize];
} }