Add macOS support by using upstream SVGKit mac port

dreampiggy · dreampiggy · commit 66e08c9eb262 · 2018-10-28T10:52:21.000+08:00
diff --git a/Cartfile b/Cartfile
@@ -1,2 +1,2 @@
-github "rs/SDWebImage" >= 5.0.0-beta3
+github "SDWebImage/SDWebImage" >= 5.0.0-beta3
 github "SVGKit/SVGKit" "2.x"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,3 +1,3 @@
 github "CocoaLumberjack/CocoaLumberjack" "3.4.2"
-github "SVGKit/SVGKit" "6b673b7ae452e481593047251a61e061bd0aa5a9"
-github "rs/SDWebImage" "5.0.0-beta3"
+github "SDWebImage/SDWebImage" "5.0.0-beta3"
+github "SVGKit/SVGKit" "b1eae9cf1b1dbf69bc15334f905f5c602f1b13ca"
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -30,14 +30,14 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   SVGKit:
-    :commit: 733acf66e44a02396efc8a6f445d190af592d544
+    :commit: b1eae9cf1b1dbf69bc15334f905f5c602f1b13ca
     :git: https://github.com/SVGKit/SVGKit.git
 
 SPEC CHECKSUMS:
   CocoaLumberjack: db7cc9e464771f12054c22ff6947c5a58d43a0fd
   SDWebImage: e52654ceef9fdc19f4c612d64a5b6d3f05dd81a4
-  SDWebImageSVGCoder: f2b3b74ff39acbb28f60c1dad2e0fd19fa04cb6c
-  SVGKit: 4055d9e809b5db8633755979cfb3b02dc5a8c20d
+  SDWebImageSVGCoder: a39ffaef7618b138d18eef8e3c49c96a3637fbe2
+  SVGKit: e0b3dd403cc7cf0d66889f32b6aa1a6b38aa6911
 
 PODFILE CHECKSUM: dc5153f27ba2a6dd43c49d8e0100b34b78f46730
 
diff --git a/README.md b/README.md
@@ -20,6 +20,7 @@ You can modify the code or use some other SVG files to check the compatibility.
 
 + iOS 8
 + tvOS 9
++ macOS 10.10
 
 ## Installation
 
diff --git a/SDWebImageSVGCoder.podspec b/SDWebImageSVGCoder.podspec
@@ -28,6 +28,7 @@ TODO: Add long description of the pod here.
 
   s.ios.deployment_target = '8.0'
   s.tvos.deployment_target = '9.0'
+  s.osx.deployment_target = '10.10'
 
   s.source_files = 'SDWebImageSVGCoder/Classes/**/*', 'SDWebImageSVGCoder/Module/SDWebImageSVGCoder.h'
   s.module_map = 'SDWebImageSVGCoder/Module/SDWebImageSVGCoder.modulemap'
diff --git a/SDWebImageSVGCoder.xcodeproj/project.pbxproj b/SDWebImageSVGCoder.xcodeproj/project.pbxproj
diff --git a/SDWebImageSVGCoder.xcodeproj/xcshareddata/xcschemes/SDWebImageSVGCoder macOS.xcscheme b/SDWebImageSVGCoder.xcodeproj/xcshareddata/xcschemes/SDWebImageSVGCoder macOS.xcscheme
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1000"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "328C14B52184C856006B0C4A"
+               BuildableName = "SDWebImageSVGCoder_macOS.framework"
+               BlueprintName = "SDWebImageSVGCoder macOS"
+               ReferencedContainer = "container:SDWebImageSVGCoder.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "328C14B52184C856006B0C4A"
+            BuildableName = "SDWebImageSVGCoder_macOS.framework"
+            BlueprintName = "SDWebImageSVGCoder macOS"
+            ReferencedContainer = "container:SDWebImageSVGCoder.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "328C14B52184C856006B0C4A"
+            BuildableName = "SDWebImageSVGCoder_macOS.framework"
+            BlueprintName = "SDWebImageSVGCoder macOS"
+            ReferencedContainer = "container:SDWebImageSVGCoder.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/SDWebImageSVGCoder/Classes/SDImageSVGCoder.m b/SDWebImageSVGCoder/Classes/SDImageSVGCoder.m
@@ -41,7 +41,12 @@ - (UIImage *)decodedImageWithData:(NSData *)data options:(SDImageCoderOptions *)
     // Check specified image size
     SDWebImageContext *context = options[SDImageCoderWebImageContext];
     if (context[SDWebImageContextVectorImageSize]) {
-        CGSize imageSize = [context[SDWebImageContextVectorImageSize] CGSizeValue];
+        NSValue *sizeValue = context[SDWebImageContextVectorImageSize];
+#if SD_UIKIT
+        CGSize imageSize = sizeValue.CGSizeValue;
+#else
+        CGSize imageSize = sizeValue.sizeValue;
+#endif
         if (!CGSizeEqualToSize(imageSize, CGSizeZero)) {
             svgImage.size = imageSize;
         }
diff --git a/SDWebImageSVGCoder/Classes/SDSVGImage.m b/SDWebImageSVGCoder/Classes/SDSVGImage.m
@@ -19,7 +19,12 @@ @implementation SDSVGImage
 - (instancetype)initWithSVGImage:(SVGKImage *)image {
     NSParameterAssert(image);
     UIImage *posterImage = image.UIImage;
-    self = [super initWithCGImage:posterImage.CGImage scale:posterImage.scale orientation:posterImage.imageOrientation];
+#if SD_UIKIT
+    UIImageOrientation imageOrientation = posterImage.imageOrientation;
+#else
+    CGImagePropertyOrientation imageOrientation = kCGImagePropertyOrientationUp;
+#endif
+    self = [super initWithCGImage:posterImage.CGImage scale:posterImage.scale orientation:imageOrientation];
     if (self) {
         self.SVGImage = image;
     }
@@ -59,7 +64,12 @@ - (instancetype)initWithData:(NSData *)data scale:(CGFloat)scale options:(SDImag
     // Check specified image size
     SDWebImageContext *context = options[SDImageCoderWebImageContext];
     if (context[SDWebImageContextVectorImageSize]) {
-        CGSize imageSize = [context[SDWebImageContextVectorImageSize] CGSizeValue];
+        NSValue *sizeValue = context[SDWebImageContextVectorImageSize];
+#if SD_UIKIT
+        CGSize imageSize = sizeValue.CGSizeValue;
+#else
+        CGSize imageSize = sizeValue.sizeValue;
+#endif
         if (!CGSizeEqualToSize(imageSize, CGSizeZero)) {
             svgImage.size = imageSize;
         }
diff --git a/SDWebImageSVGCoder/Classes/SDWebImageSVGCoderDefine.h b/SDWebImageSVGCoder/Classes/SDWebImageSVGCoderDefine.h
@@ -9,6 +9,7 @@
 
 @class SVGKImage;
 
+#if SD_UIKIT
 /**
  Adjust `SVGKImage`'s viewPort && viewBox to match the specify `contentMode` of view size.
  @note Though this util method can be used outside this framework. For simple SVG image loading, it's recommaned to use `sd_adjustContentMode` property on `SVGKImageView+WebCache`.
@@ -18,6 +19,7 @@
  @param viewSize Target view size, typically specify the `view.bounds.size`.
  */
 FOUNDATION_EXPORT void SDAdjustSVGContentMode(SVGKImage * __nonnull svgImage, UIViewContentMode contentMode, CGSize viewSize);
+#endif
 
 /**
  A CGSize raw value which specify the desired vector image size during image loading. Because vector image like SVG format, may not contains a fixed size, or you want to get a larger size bitmap representation UIImage. (NSValue)
diff --git a/SDWebImageSVGCoder/Classes/SDWebImageSVGCoderDefine.m b/SDWebImageSVGCoder/Classes/SDWebImageSVGCoderDefine.m
@@ -8,6 +8,7 @@
 #import "SDWebImageSVGCoderDefine.h"
 #import <SVGKit/SVGKit.h>
 
+#if SD_UIKIT
 void SDAdjustSVGContentMode(SVGKImage * svgImage, UIViewContentMode contentMode, CGSize viewSize) {
     NSCParameterAssert(svgImage);
     if (!svgImage.hasSize) {
@@ -137,5 +138,6 @@ void SDAdjustSVGContentMode(SVGKImage * svgImage, UIViewContentMode contentMode,
             break;
     }
 }
+#endif
 
 SDWebImageContextOption _Nonnull const SDWebImageContextVectorImageSize = @"vectorImageSize";
diff --git a/SDWebImageSVGCoder/Classes/SVGKImageView+WebCache.h b/SDWebImageSVGCoder/Classes/SVGKImageView+WebCache.h
@@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
  * Unlike `UIView`, `SVGKImageView`'s subclass does not follows `UIView.contentMode` property, the position of SVG vector image is controled by `SVGKImage` instance with SVG's viewport && viewbox information. You can adjust it after image was loading, however it's not so convenient.
  * So we provide a simple solution. If you want the same behavior like UIImageView to use `contentMode` property to position SVG images, set this value to YES and we'll resize the SVG image to correspond `contentMode` of `SVGKImageView` during image loading.
  */
-@property (nonatomic, assign) BOOL sd_adjustContentMode;
+@property (nonatomic, assign) BOOL sd_adjustContentMode API_UNAVAILABLE(macos);
 
 /**
  * Set the imageView `image` with an `url`.
diff --git a/SDWebImageSVGCoder/Classes/SVGKImageView+WebCache.m b/SDWebImageSVGCoder/Classes/SVGKImageView+WebCache.m
@@ -81,9 +81,11 @@ - (void)sd_setImageWithURL:(nullable NSURL *)url
                                svgImage = ((SDSVGImage *)image).SVGImage;
                            }
                            if (svgImage) {
+#if SD_UIKIT
                                if (self.sd_adjustContentMode) {
                                    SDAdjustSVGContentMode(svgImage, strongSelf.contentMode, strongSelf.bounds.size);
                                }
+#endif
                                strongSelf.image = svgImage;
                            } else {
                                strongSelf.image = nil;
diff --git a/SDWebImageSVGCoder/Info.plist b/SDWebImageSVGCoder/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>0.1.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-github "rs/SDWebImage" >= 5.0.0-beta3`
	`1`	`+github "SDWebImage/SDWebImage" >= 5.0.0-beta3`
`2`	`2`	`github "SVGKit/SVGKit" "2.x"`