[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/10] ui/cocoa: Drop tests for CGImageCreateWithImag
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 04/10] ui/cocoa: Drop tests for CGImageCreateWithImageInRect support |
Date: |
Tue, 19 May 2015 09:23:49 +0100 |
The code that tries to test at both compiletime and runtime
for whether CGImageCreateWithImageInRect is supported provokes
a compile warning on OSX 10.3:
ui/cocoa.m:378:13: warning: comparison of function
'CGImageCreateWithImageInRect'
equal to a null pointer is always false[-Wtautological-pointer-compare]
if (CGImageCreateWithImageInRect == NULL) { // test if
"CGImageCreateWithImageInRect" is
supported on host at runtime
^~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~
The simplest way to deal with this is just to drop this code,
since we don't in practice support OSX 10.4 anyway. (10.5 was
released in 2007 and is the last PPC version, so is the earliest
we really need to continue to support at all.)
Signed-off-by: Peter Maydell <address@hidden>
Message-id: address@hidden
---
ui/cocoa.m | 50 ++++++++++++++++++++------------------------------
1 file changed, 20 insertions(+), 30 deletions(-)
diff --git a/ui/cocoa.m b/ui/cocoa.m
index d1d29bc..6e69952 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -374,40 +374,30 @@ QemuCocoaView *cocoaView;
0, //interpolate
kCGRenderingIntentDefault //intent
);
-// test if host supports "CGImageCreateWithImageInRect" at compile time
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4)
- if (CGImageCreateWithImageInRect == NULL) { // test if
"CGImageCreateWithImageInRect" is supported on host at runtime
-#endif
- // compatibility drawing code (draws everything) (OS X < 10.4)
- CGContextDrawImage (viewContextRef, CGRectMake(0, 0, [self
bounds].size.width, [self bounds].size.height), imageRef);
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4)
- } else {
- // selective drawing code (draws only dirty rectangles) (OS X >=
10.4)
- const NSRect *rectList;
+ // selective drawing code (draws only dirty rectangles) (OS X >= 10.4)
+ const NSRect *rectList;
#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
- NSInteger rectCount;
+ NSInteger rectCount;
#else
- int rectCount;
+ int rectCount;
#endif
- int i;
- CGImageRef clipImageRef;
- CGRect clipRect;
-
- [self getRectsBeingDrawn:&rectList count:&rectCount];
- for (i = 0; i < rectCount; i++) {
- clipRect.origin.x = rectList[i].origin.x / cdx;
- clipRect.origin.y = (float)screen.height -
(rectList[i].origin.y + rectList[i].size.height) / cdy;
- clipRect.size.width = rectList[i].size.width / cdx;
- clipRect.size.height = rectList[i].size.height / cdy;
- clipImageRef = CGImageCreateWithImageInRect(
- imageRef,
- clipRect
- );
- CGContextDrawImage (viewContextRef, cgrect(rectList[i]),
clipImageRef);
- CGImageRelease (clipImageRef);
- }
+ int i;
+ CGImageRef clipImageRef;
+ CGRect clipRect;
+
+ [self getRectsBeingDrawn:&rectList count:&rectCount];
+ for (i = 0; i < rectCount; i++) {
+ clipRect.origin.x = rectList[i].origin.x / cdx;
+ clipRect.origin.y = (float)screen.height - (rectList[i].origin.y +
rectList[i].size.height) / cdy;
+ clipRect.size.width = rectList[i].size.width / cdx;
+ clipRect.size.height = rectList[i].size.height / cdy;
+ clipImageRef = CGImageCreateWithImageInRect(
+ imageRef,
+ clipRect
+ );
+ CGContextDrawImage (viewContextRef, cgrect(rectList[i]),
clipImageRef);
+ CGImageRelease (clipImageRef);
}
-#endif
CGImageRelease (imageRef);
}
}
--
1.9.1
- [Qemu-devel] [PULL 00/10] cocoa queue, Peter Maydell, 2015/05/19
- [Qemu-devel] [PULL 10/10] ui/cocoa: Add console items to the View menu, Peter Maydell, 2015/05/19
- [Qemu-devel] [PULL 09/10] ui/cocoa: Avoid deprecated NSOKButton/NSCancelButton constants, Peter Maydell, 2015/05/19
- [Qemu-devel] [PULL 05/10] ui/cocoa: Remove compatibility ifdefs for OSX 10.4, Peter Maydell, 2015/05/19
- [Qemu-devel] [PULL 04/10] ui/cocoa: Drop tests for CGImageCreateWithImageInRect support,
Peter Maydell <=
- [Qemu-devel] [PULL 01/10] ui/cocoa: Fix several full screen issues on Mac OS X, Peter Maydell, 2015/05/19
- [Qemu-devel] [PULL 06/10] ui/cocoa: openPanelDidEnd returnCode should be NSInteger, not int, Peter Maydell, 2015/05/19
- [Qemu-devel] [PULL 07/10] ui/cocoa: Declare that QemuCocoaAppController implements NSApplicationDelegate, Peter Maydell, 2015/05/19
- [Qemu-devel] [PULL 08/10] ui/cocoa: Don't use NSWindow useOptimizedDrawing on OSX 10.10 and up, Peter Maydell, 2015/05/19
- [Qemu-devel] [PULL 02/10] ui/cocoa: Make -full-screen option work on Mac OS X, Peter Maydell, 2015/05/19
- [Qemu-devel] [PULL 03/10] Makefile.target: set icon for binary file on Mac OS X, Peter Maydell, 2015/05/19
- Re: [Qemu-devel] [PULL 00/10] cocoa queue, Peter Maydell, 2015/05/19