Use SVGKImageRep for the SVGKImage's NSImage getter.

MaddTheSane · Jun 29, 2013 · 80539ed · 80539ed
1 parent 930c1ce
commit 80539ed
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/Source/AppKit additions/SVGKImageRep.m b/Source/AppKit additions/SVGKImageRep.m
@@ -246,16 +246,23 @@ - (BOOL)drawInRect:(NSRect)rect
 		CGLayerRelease(layerRef);
 	} else {
 		//...But should the method be removed in a future version, fall back to the old method
-		NSImage *tmpImage = self.image.NSImage;
+		NSImage *tmpImage = [[NSImage alloc] initWithSize:scaledSize];
 		if (!tmpImage) {
 			return NO;
 		}
 
+		NSBitmapImageRep *bitRep = self.image.bitmapImageRep;
+		if (!bitRep) {
+			return NO;
+		}
+		[tmpImage addRepresentation:bitRep];
+
 		NSRect imageRect;
 		imageRect.size = rect.size;
 		imageRect.origin = NSZeroPoint;
 
 		[tmpImage drawAtPoint:rect.origin fromRect:imageRect operation:NSCompositeCopy fraction:1];
+		[tmpImage release];
 	}
 
 	return YES;
@@ -285,16 +292,23 @@ - (BOOL)draw
 		CGLayerRelease(layerRef);
 	} else {
 		//...But should the method be removed in a future version, fall back to the old method
-		NSImage *tmpImage = self.image.NSImage;
+		NSImage *tmpImage = [[NSImage alloc] initWithSize:scaledSize];
 		if (!tmpImage) {
 			return NO;
 		}
 
+		NSBitmapImageRep *bitRep = self.image.bitmapImageRep;
+		if (!bitRep) {
+			return NO;
+		}
+		[tmpImage addRepresentation:bitRep];
+
 		NSRect imageRect;
 		imageRect.size = self.size;
 		imageRect.origin = NSZeroPoint;
 
 		[tmpImage drawAtPoint:NSZeroPoint fromRect:imageRect operation:NSCompositeCopy fraction:1];
+		[tmpImage release];
 	}
 
 	return YES;

diff --git a/Source/SVGKImage.m b/Source/SVGKImage.m
@@ -15,6 +15,9 @@
 #import "SVGKSourceLocalFile.h"
 #import "SVGKSourceURL.h"
 #import "SVGKSourceData.h"
+#if !(TARGET_OS_EMBEDDED || TARGET_OS_IPHONE)
+#import "SVGKImageRep.h"
+#endif
 
 #import "BlankSVG.h"
 
@@ -383,7 +386,13 @@ - (CIImage*)CIImage
 
 - (NSImage*)NSImage
 {
-	return [self exportNSImageAntiAliased:YES curveFlatnessFactor:1.0 interpolationQuality:kCGInterpolationDefault];
+	SVGKImageRep *imRep = [SVGKImageRep imageRepWithSVGImage:self];
+	if (!imRep) {
+		return [self exportNSImageAntiAliased:YES curveFlatnessFactor:1.0 interpolationQuality:kCGInterpolationDefault];
+	}
+	NSImage *retImage = [[NSImage alloc] initWithSize:self.size];
+	[retImage addRepresentation:imRep];
+	return [retImage autorelease];
 }
 
 - (NSBitmapImageRep *)bitmapImageRep