size

Author: swhitty

SwiftDraw/CommandLine+Process.swift

@@ -97,15 +97,18 @@ public extension CommandLine {
         case .jpeg:
             return try image
                 .inset(makeImageInsets(for: config.insets))
-                .jpegData(size: config.size.cgValue, scale: config.scale.cgValue)
+                .size(config.size.cgValue)
+                .jpegData(scale: config.scale.cgValue)
         case .pdf:
             return try image
                 .inset(makeImageInsets(for: config.insets))
-                .pdfData(size: config.size.cgValue)
+                .size(config.size.cgValue)
+                .pdfData()
         case .png:
             return try image
                 .inset(makeImageInsets(for: config.insets))
-                .pngData(size: config.size.cgValue, scale: config.scale.cgValue)
+                .size(config.size.cgValue)
+                .pngData(scale: config.scale.cgValue)
         case .swift, .sfsymbol:
             throw Error.unsupported
         }
@@ -133,6 +136,12 @@ public extension CommandLine {
 }
 
 private extension SVG {
+
+    func size(_ s: CGSize?) -> SVG {
+        guard let s else { return self }
+        return size(s)
+    }
+
     func inset(_ insets: Insets) -> SVG {
         expand(top: -insets.top, left: -insets.left, bottom: -insets.bottom, right: -insets.right)
     }

SwiftDraw/SVG.swift

@@ -80,6 +80,18 @@ public struct SVG: Hashable {
 
 extension SVG {
 
+    public func size(_ s: CGSize) -> SVG {
+        guard size != s else { return self }
+
+        let sx = s.width / size.width
+        let sy = s.height / size.height
+
+        var copy = self
+        copy.commands.insert(.scale(sx: sx, sy: sy), at: 0)
+        copy.size = s
+        return copy
+    }
+
     public func scale(_ factor: CGFloat) -> SVG {
         scale(x: factor, y: factor)
     }
@@ -119,6 +131,10 @@ extension SVG {
 
 extension SVG {
 
+    public mutating func sized(_ s: CGSize) {
+        self = size(s)
+    }
+
     public mutating func scaled(_ factor: CGFloat) {
         self = scale(factor)
     }

SwiftDrawTests/SVGTests.swift

@@ -86,6 +86,17 @@ final class SVGTests: XCTestCase {
     }
 #endif
 
+    func testSize() {
+        let image = SVG.makeLines()
+
+        XCTAssertEqual(image.size, CGSize(width: 100, height: 100))
+        XCTAssertEqual(image.size(CGSize(width: 200, height: 200)).size, CGSize(width: 200, height: 200))
+
+        var copy = image
+        copy.sized(CGSize(width: 20, height: 20))
+        XCTAssertEqual(copy.size, CGSize(width: 20, height: 20))
+    }
+
     func testScale() {
         let image = SVG.makeLines()