diff options
author | Jake Petroules <jake.petroules@qt.io> | 2017-08-02 12:56:44 -0700 |
---|---|---|
committer | Jędrzej Nowacki <jedrzej.nowacki@qt.io> | 2017-08-04 17:55:48 +0000 |
commit | 861544583511d4e6f7745d2339b26ff1cd44132b (patch) | |
tree | 926e0f3f8d3508b3a6a78df9478d060fb90a9a95 /src/gui/painting/qcoregraphics.mm | |
parent | 569171f620db433233df49661c4f8ff22c26fc67 (diff) |
Fix build error with macOS 10.13 SDK
Several of these variables/macros are no longer defined. We didn't
validate the preconditions on iOS, tvOS, or watchOS, so no
need to bother validating them on macOS either. Nor did we check the
OSStatus result on any platform anyways.
Task-number: QTBUG-62266
Change-Id: Id19ebead5d3a8a08a0a56d798f0173d0d893fc91
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Diffstat (limited to 'src/gui/painting/qcoregraphics.mm')
-rw-r--r-- | src/gui/painting/qcoregraphics.mm | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/gui/painting/qcoregraphics.mm b/src/gui/painting/qcoregraphics.mm index 98fdd7f35e..c4fb8afc64 100644 --- a/src/gui/painting/qcoregraphics.mm +++ b/src/gui/painting/qcoregraphics.mm @@ -72,17 +72,8 @@ CGImageRef qt_mac_toCGImageMask(const QImage &image) image.bytesPerLine(), dataProvider, NULL, false); } -OSStatus qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGImageRef inImage) +void qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGImageRef inImage) { - // Verbatim copy if HIViewDrawCGImage (as shown on Carbon-Dev) - OSStatus err = noErr; - -#ifdef Q_OS_MACOS - require_action(inContext != NULL, InvalidContext, err = paramErr); - require_action(inBounds != NULL, InvalidBounds, err = paramErr); - require_action(inImage != NULL, InvalidImage, err = paramErr); -#endif - CGContextSaveGState( inContext ); CGContextTranslateCTM (inContext, 0, inBounds->origin.y + CGRectGetMaxY(*inBounds)); CGContextScaleCTM(inContext, 1, -1); @@ -90,13 +81,6 @@ OSStatus qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGIm CGContextDrawImage(inContext, *inBounds, inImage); CGContextRestoreGState(inContext); - -#ifdef Q_OS_MACOS -InvalidImage: -InvalidBounds: -InvalidContext: -#endif - return err; } QImage qt_mac_toQImage(CGImageRef image) |