no seriously fixed the graphics stack for GC

ruz · May 18, 2011 · d9ebc37 · d9ebc37
1 parent a8124db
commit d9ebc37
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/UIKit/Classes/UIGraphics.m b/UIKit/Classes/UIGraphics.m
@@ -33,16 +33,16 @@
 #import <AppKit/AppKit.h>
 
 typedef struct UISavedGraphicsContext_ {
-    NSGraphicsContext *context;
-    struct __strong UISavedGraphicsContext_ *previous;
+	NSGraphicsContext *context;
+    __strong struct UISavedGraphicsContext_ *previous;
 } UISavedGraphicsContext;
 
 static UISavedGraphicsContext *contextStack = NULL;
 
 void UIGraphicsPushContext(CGContextRef ctx)
 {
     UISavedGraphicsContext *savedContext = (UISavedGraphicsContext *) malloc(sizeof(UISavedGraphicsContext));
-    savedContext->context = [[NSGraphicsContext currentContext] retain];
+    savedContext->context = CFRetain([NSGraphicsContext currentContext]);
     savedContext->previous = contextStack;
     contextStack = savedContext;
     CGContextRetain(ctx);
@@ -54,11 +54,13 @@ void UIGraphicsPopContext()
     UISavedGraphicsContext *popContext = contextStack;
     if (popContext) {
 		CGContextRef oldContext = [[NSGraphicsContext currentContext] graphicsPort];
-        CGContextRelease(oldContext);
+
         contextStack = popContext->previous;
         [NSGraphicsContext setCurrentContext:popContext->context];
-        [popContext->context release];
+        CFRelease(popContext->context);
 		free(popContext), popContext = NULL;
+
+		CGContextRelease(oldContext);
     }
 }