Helpers

Author: swhitty

SwiftDraw/NSImage+Image.swift

@@ -35,25 +35,40 @@ import CoreGraphics
 
 public extension NSImage {
 
-  convenience init?(svgNamed name: String, in bundle: Bundle = Bundle.main) {
+  convenience init?(svgNamed name: String, in bundle: Bundle = .main) {
     guard let image = Image(named: name, in: bundle) else { return nil }
+    self.init(image)
+  }
+
+  @objc(initWithSVGData:)
+  convenience init?(_ data: Data) {
+    guard let image = Image(data: data) else { return nil }
+    self.init(image)
+  }
+
+  @objc(initWithContentsOfSVGFile:)
+  convenience init?(contentsOfSVGFile path: String) {
+    guard let image = Image(fileURL: URL(fileURLWithPath: path)) else { return nil }
+    self.init(image)
+  }
+
+  @objc(svgNamed:)
+  static func _svgNamed(_ name: String) -> NSImage? {
+    NSImage(svgNamed: name, in: .main)
+  }
 
+  @objc(svgNamed:inBundle:)
+  static func _svgNamed(_ name: String, in bundle: Bundle) -> NSImage? {
+    NSImage(svgNamed: name, in: bundle)
+  }
+
+  convenience init(_ image: Image) {
     self.init(size: image.size, flipped: true) { rect in
       guard let ctx = NSGraphicsContext.current?.cgContext else { return false }
       ctx.draw(image, in: CGRect(x: 0, y: 0, width: rect.size.width, height: rect.size.height))
       return true
     }
   }
-
-  @objc
-  static func svgNamed(_ name: String, inBundle: Bundle) -> NSImage? {
-    NSImage(svgNamed: name, in: inBundle)
-  }
-
-  @objc
-  static func svgNamed(_ name: String) -> NSImage? {
-      NSImage(svgNamed: name, in: .main)
-  }
 }
 
 public extension Image {

SwiftDraw/UIImage+Image.swift

@@ -34,24 +34,37 @@ import UIKit
 
 public extension UIImage {
 
-  convenience init?(svgNamed name: String, in bundle: Bundle = Bundle.main) {
-    guard let image = Image(named: name, in: bundle)?.rasterize(),
-      let cgImage = image.cgImage else {
-        return nil
-    }
+  convenience init?(svgNamed name: String, in bundle: Bundle = .main) {
+    guard let image = Image(named: name, in: bundle) else { return nil }
+    self.init(image)
+  }
 
-    self.init(cgImage: cgImage, scale: image.scale, orientation: image.imageOrientation)
+  @objc(initWithSVGData:)
+  convenience init?(svgData: Data) {
+    guard let image = Image(data: svgData) else { return nil }
+    self.init(image)
   }
 
-  @objc
-  static func svgNamed(_ name: String, inBundle: Bundle) -> UIImage? {
-    UIImage(svgNamed: name, in: inBundle)
+  @objc(initWithContentsOfSVGFile:)
+  convenience init?(contentsOfSVGFile path: String) {
+    guard let image = Image(fileURL: URL(fileURLWithPath: path)) else { return nil }
+    self.init(image)
   }
 
-  @objc
-  static func svgNamed(_ name: String) -> UIImage? {
+  @objc(svgNamed:)
+  static func _svgNamed(_ name: String) -> UIImage? {
       UIImage(svgNamed: name, in: .main)
   }
+
+  @objc(svgNamed:inBundle:)
+  static func _svgNamed(_ name: String, in bundle: Bundle) -> UIImage? {
+    UIImage(svgNamed: name, in: bundle)
+  }
+
+  convenience init(_ image: Image) {
+      let image = image.rasterize()
+      self.init(cgImage: image.cgImage!, scale: image.scale, orientation: image.imageOrientation)
+  }
 }
 
 public extension Image {