66//
77
88#import " SDImageSVGCoder.h"
9- #import " SDSVGImage.h"
109#import " SDWebImageSVGCoderDefine.h"
11- #import < SVGKit/SVGKit.h>
1210#import < dlfcn.h>
11+ #import < objc/runtime.h>
1312
1413#define kSVGTagEnd @" </svg>"
1514
1615typedef struct CF_BRIDGED_TYPE (id ) CGSVGDocument *CGSVGDocumentRef;
1716static CGSVGDocumentRef (*CGSVGDocumentCreateFromDataProvider)(CGDataProviderRef provider, CFDictionaryRef options);
1817static CGSVGDocumentRef (*CGSVGDocumentRetain)(CGSVGDocumentRef);
1918static void (*CGSVGDocumentRelease)(CGSVGDocumentRef);
19+ static void (*CGSVGDocumentWriteToData)(CGSVGDocumentRef document, CFDataRef data, CFDictionaryRef options);
2020
2121#if SD_UIKIT
2222
@@ -32,6 +32,20 @@ - (CGSVGDocumentRef)_CGSVGDocument;
3232
3333#endif
3434
35+ #if SD_MAC
36+
37+ #define NSSVGImageRepClass @" _NSSVGImageRep"
38+
39+ @protocol NSSVGImageRepProtocol <NSObject >
40+
41+ - (instancetype )initWithSVGDocument : (CGSVGDocumentRef)document ;
42+ - (instancetype )initWithData : (NSData *)data ;
43+ - (CGSVGDocumentRef)_document ;
44+
45+ @end
46+
47+ #endif
48+
3549@implementation SDImageSVGCoder
3650
3751+ (SDImageSVGCoder *)sharedCoder {
@@ -47,6 +61,7 @@ + (void)initialize {
4761 CGSVGDocumentCreateFromDataProvider = dlsym (RTLD_DEFAULT, " CGSVGDocumentCreateFromDataProvider"
4862 CGSVGDocumentRetain = dlsym (RTLD_DEFAULT, " CGSVGDocumentRetain"
4963 CGSVGDocumentRelease = dlsym (RTLD_DEFAULT, " CGSVGDocumentRelease"
64+ CGSVGDocumentWriteToData = dlsym (RTLD_DEFAULT, " CGSVGDocumentWriteToData"
5065}
5166
5267#pragma mark - Decode
@@ -59,20 +74,27 @@ - (UIImage *)decodedImageWithData:(NSData *)data options:(SDImageCoderOptions *)
5974 if (!data) {
6075 return nil ;
6176 }
62- #if SD_UIKIT
63- if ([self .class supportsVectorSVGImage ]) {
64- return [self createVectorSVGWithData: data options: options];
65- } else {
66- return [self createBitmapSVGWithData: data options: options];
77+ if (![self .class supportsVectorSVGImage ]) {
78+ return nil ;
6779 }
80+ // Parse args
81+ SDWebImageContext *context = options[SDImageCoderWebImageContext];
82+ NSValue *sizeValue = context[SDWebImageContextSVGImageSize];
83+ #if SD_MAC
84+ CGSize imageSize = sizeValue.sizeValue ;
85+ #else
86+ CGSize imageSize = sizeValue.CGSizeValue ;
87+ #endif
88+
89+ #if SD_MAC
90+ Class imageRepClass = NSClassFromString (NSSVGImageRepClass);
91+ NSImageRep *imageRep = [[imageRepClass alloc ] initWithData: data];
92+ if (!imageRep) {
93+ return nil ;
94+ }
95+ NSImage *image = [[NSImage alloc ] initWithSize: imageSize];
96+ [image addRepresentation: imageRep];
6897#else
69- return [self createBitmapSVGWithData: data options: options];
70- #endif
71- }
72-
73- #if SD_UIKIT
74- - (UIImage *)createVectorSVGWithData : (NSData *)data options : (SDImageCoderOptions *)options {
75- NSParameterAssert (data);
7698 CGDataProviderRef provider = CGDataProviderCreateWithCFData ((__bridge CFDataRef)data);
7799 if (!provider) {
78100 return nil ;
@@ -83,51 +105,7 @@ - (UIImage *)createVectorSVGWithData:(NSData *)data options:(SDImageCoderOptions
83105 }
84106 UIImage *image = [UIImage _imageWithCGSVGDocument: document];
85107 CGSVGDocumentRelease (document);
86-
87- return image;
88- }
89108#endif
90-
91- - (UIImage *)createBitmapSVGWithData : (NSData *)data options : (SDImageCoderOptions *)options {
92- NSParameterAssert (data);
93- // Parse SVG
94- SVGKImage *svgImage = [[SVGKImage alloc ] initWithData: data];
95- if (!svgImage) {
96- return nil ;
97- }
98-
99- CGSize imageSize = CGSizeZero;
100- BOOL preserveAspectRatio = YES ;
101- // Parse args
102- SDWebImageContext *context = options[SDImageCoderWebImageContext];
103- if (context[SDWebImageContextSVGImageSize]) {
104- NSValue *sizeValue = context[SDWebImageContextSVGImageSize];
105- #if SD_UIKIT
106- imageSize = sizeValue.CGSizeValue ;
107- #else
108- imageSize = sizeValue.sizeValue ;
109- #endif
110- }
111- if (context[SDWebImageContextSVGImagePreserveAspectRatio]) {
112- preserveAspectRatio = [context[SDWebImageContextSVGImagePreserveAspectRatio] boolValue ];
113- }
114-
115- if (!CGSizeEqualToSize (imageSize, CGSizeZero)) {
116- if (preserveAspectRatio) {
117- [svgImage scaleToFitInside: imageSize];
118- } else {
119- svgImage.size = imageSize;
120- }
121- }
122-
123- UIImage *image = svgImage.UIImage ;
124- if (!image) {
125- return nil ;
126- }
127-
128- // SVG is vector image, so no need scale factor
129- image.sd_imageFormat = SDImageFormatSVG;
130-
131109 return image;
132110}
133111
@@ -137,41 +115,54 @@ - (BOOL)canEncodeToFormat:(SDImageFormat)format {
137115 return format == SDImageFormatSVG;
138116}
139117
140- - (NSData *)encodedDataWithImage : (UIImage *)image format : (SDImageFormat)format options : (SDImageCoderOptions *)options {
141- // Only support SVGKImage wrapper
142- if (![image isKindOfClass: SDSVGImage.class]) {
118+ - (NSData *)encodedDataWithImage : (UIImage *)image format : (SDImageFormat)format options : (SDImageCoderOptions *)options { // SVGKImage wrapper
119+ if (![self .class supportsVectorSVGImage ]) {
143120 return nil ;
144121 }
145- SVGKImage *svgImage = ((SDSVGImage *)image).SVGImage ;
146- if (!svgImage) {
147- return nil ;
122+ NSMutableData *data = [NSMutableData data ];
123+ CGSVGDocumentRef document = NULL ;
124+ #if SD_MAC
125+ NSRect imageRect = NSMakeRect (0 , 0 , image.size .width , image.size .height );
126+ NSImageRep *imageRep = [image bestRepresentationForRect: imageRect context: nil hints: nil ];
127+ if ([imageRep isKindOfClass: NSClassFromString (NSSVGImageRepClass)]) {
128+ Ivar ivar = class_getInstanceVariable (imageRep.class , " _document"
129+ document = (__bridge CGSVGDocumentRef)(object_getIvar (imageRep, ivar));
148130 }
149- SVGKSource *source = svgImage.source ;
150- // Should be NSData type source
151- if (![source isKindOfClass: SVGKSourceNSData.class]) {
131+ #else
132+ document = [image _CGSVGDocument ];
133+ #endif
134+ if (!document) {
152135 return nil ;
153136 }
154- return ((SVGKSourceNSData *)source).rawData ;
137+
138+ CGSVGDocumentWriteToData (document, (__bridge CFDataRef)data, NULL );
139+
140+ return [data copy ];
155141}
156142
157143#pragma mark - Helper
158144
159145+ (BOOL )supportsVectorSVGImage {
160- #if SD_MAC
161- return NO ;
162- #else
163146 static dispatch_once_t onceToken;
164147 static BOOL supports;
165148 dispatch_once (&onceToken, ^{
149+ #if SD_MAC
150+ // macOS 10.15+ supports SVG built-in rendering, use selector to check is more accurate
151+ if (NSClassFromString (NSSVGImageRepClass)) {
152+ supports = YES ;
153+ } else {
154+ supports = NO ;
155+ }
156+ #else
166157 // iOS 13+ supports SVG built-in rendering, use selector to check is more accurate
167158 if ([UIImage respondsToSelector: @selector (_imageWithCGSVGDocument: )]) {
168159 supports = YES ;
169160 } else {
170161 supports = NO ;
171162 }
163+ #endif
172164 });
173165 return supports;
174- #endif
175166}
176167
177168+ (BOOL )isSVGFormatForData : (NSData *)data {
0 commit comments