Merge pull request #111 from hfutrell/0.15.0-release

0.15.0 release

.github/workflows/ci.yml

@@ -3,16 +3,25 @@ name: BezierKit Mac + Linux
 on: [push, pull_request]
 
 jobs:
-  build:
-    name: BezierKit on ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest]
-    runs-on: ${{ matrix.os }}
-
+  Mac:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Build
+        run: swift build
+      - name: Run tests
+        run: |
+         swift test --enable-test-discovery --enable-code-coverage
+         xcrun llvm-cov export -format="lcov" .build/debug/BezierKitPackageTests.xctest/Contents/MacOS/BezierKitPackageTests -instr-profile .build/debug/codecov/default.profdata > info.lcov
+      - name: code coverage upload to codecov.io
+        uses: codecov/[email protected]
+        with:
+          file: info.lcov
+  Linux:
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: Build
         run: swift build
       - name: Run tests
-        run: swift test --enable-test-discovery
+        run: swift test --enable-test-discovery

.github/workflows/wasmBuild.yml

@@ -4,7 +4,7 @@ jobs:
   test:
     name: BezierKit WASM support
     runs-on: ubuntu-latest
-    container: ghcr.io/swiftwasm/carton:0.12.1
+    container: ghcr.io/swiftwasm/carton:0.16.0
 
     steps:
     - uses: actions/checkout@v2

BezierKit.podspec

@@ -5,7 +5,7 @@
 
 Pod::Spec.new do |s|
   s.name         = "BezierKit"
-  s.version      = "0.14.0"
+  s.version      = "0.15.0"
   s.summary      = "comprehensive Bezier Path library written in Swift"
   s.homepage     = "https://github.com/hfutrell/BezierKit"
   s.license      = "MIT"

BezierKit/BezierKit.xcodeproj/project.pbxproj

@@ -540,7 +540,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 1320;
+				LastUpgradeCheck = 1340;
 				ORGANIZATIONNAME = "Holmes Futrell";
 				TargetAttributes = {
 					FD0F54F41DC43FFB0084CDCD = {

BezierKit/BezierKit.xcodeproj/xcshareddata/xcschemes/BezierKitMacDemos.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1320"
+   LastUpgradeVersion = "1340"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

BezierKit/BezierKit.xcodeproj/xcshareddata/xcschemes/BezierKit_Mac.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1320"
+   LastUpgradeVersion = "1340"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

BezierKit/BezierKit.xcodeproj/xcshareddata/xcschemes/BezierKit_MacTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1320"
+   LastUpgradeVersion = "1340"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

BezierKit/BezierKit.xcodeproj/xcshareddata/xcschemes/BezierKit_iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1320"
+   LastUpgradeVersion = "1340"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

BezierKit/BezierKit.xcodeproj/xcshareddata/xcschemes/BezierKit_iOSTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1320"
+   LastUpgradeVersion = "1340"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

BezierKit/BezierKitTests/CubicCurveTests.swift

@@ -8,7 +8,7 @@
 
 import XCTest
 @testable import BezierKit
-#if !os(WASI)
+
 class CubicCurveTests: XCTestCase {
 
     override func setUp() {
@@ -505,6 +505,8 @@ class CubicCurveTests: XCTestCase {
         XCTAssertEqual(c1.intersections(with: c2, accuracy: 1.0e-8), expectedIntersections)
     }
 
+    // Skip on platforms where CGFloat is 32bit
+    #if !(arch(i386) || arch(arm) || arch(wasm32))
     func testRealWorldNearlyCoincidentCurvesIntersection() {
         // these curves are nearly coincident over from c1's t = 0.278 to 1.0
         // staying roughly 0.0002 distance of eachother
@@ -524,6 +526,7 @@ class CubicCurveTests: XCTestCase {
         XCTAssertEqual(intersections[1].t1, 1)
         XCTAssertEqual(intersections[1].t2, 0)
     }
+    #endif
 
     func testIntersectionsCubicButActuallyLinear() {
         // this test presents a challenge for an implicitization based approach
@@ -655,4 +658,3 @@ class CubicCurveTests: XCTestCase {
         XCTAssertNotEqual(c1, c5)
     }
 }
-#endif

BezierKit/BezierKitTests/Path+DataTests.swift

@@ -196,20 +196,17 @@ class PathDataTests: XCTestCase {
 
     #endif
 
-    #if !os(WASI)
     func testEmptyData() {
         let path = Path(data: Data())
         XCTAssertEqual(path, nil)
     }
-    #endif
 
     let simpleRectangle = {
         Path(rect: CGRect(x: 1, y: 2, width: 3, height: 4))
     }()
 
     let expectedSimpleRectangleData = Data(base64Encoded: "JbPlSAUAAAAAAQEBAQAAAAAAAPA/AAAAAAAAAEAAAAAAAAAQQAAAAAAAAABAAAAAAAAAEEAAAAAAAAAYQAAAAAAAAPA/AAAAAAAAGEAAAAAAAADwPwAAAAAAAABA")!
 
-    #if !os(WASI)
     func testSimpleRectangle() {
         XCTAssertEqual(simpleRectangle.data, expectedSimpleRectangleData)
     }
@@ -239,5 +236,4 @@ class PathDataTests: XCTestCase {
         let corruptData6 = data[0..<10] // commands cut off
         XCTAssertEqual(Path(data: corruptData6), nil)
     }
-    #endif
 }

BezierKit/BezierKitTests/PolynomialTests.swift

@@ -93,7 +93,8 @@ class PolynomialTests: XCTestCase {
         XCTAssertEqual(roots[2], 1, accuracy: accuracy)
         XCTAssertEqual(roots[3], 1.2, accuracy: accuracy)
     }
-    #if !os(WASI)
+    // Skip on platforms where CGFloat is 32bit
+    #if !(arch(i386) || arch(arm) || arch(wasm32))
     func testDegree4RepeatedRoots() {
         // x^4 - 2x^2 + 1
         let polynomial = BernsteinPolynomial4(b0: 1, b1: 1, b2: 2.0 / 3.0, b3: 0, b4: 0)

BezierKit/Library/BezierKit-ObjC.swift

@@ -88,6 +88,9 @@ public extension Path {
     @objc(initWithData:) convenience init?(_objc_data: Data) {
         self.init(data: _objc_data)
     }
+    @objc(data) var _objc_data: Data {
+        return data
+    }
 }
 
 // MARK: Path+Projection.swift

BezierKit/Library/Path+Data.swift

@@ -6,8 +6,6 @@
 //  Copyright © 2019 Holmes Futrell. All rights reserved.
 //
 
-#if !os(WASI)
-
 import Foundation
 #if canImport(CoreGraphics)
 import CoreGraphics
@@ -24,14 +22,30 @@ fileprivate extension Data {
     }
 }
 
-fileprivate extension InputStream {
-    func readNativeValue<T>(_ value: UnsafeMutablePointer<T>) -> Bool {
+private struct DataStream {
+    var dataCursor: Data.Index
+    let data: Data
+
+    init(data: Data) {
+        self.data = data
+        self.dataCursor = data.startIndex
+    }
+
+    mutating func read(_ buffer: UnsafeMutablePointer<UInt8>, maxLength: Int) -> Int {
+        let startIndex = dataCursor
+        let endIndex = min(dataCursor + maxLength, data.count)
+        data.copyBytes(to: buffer, from: startIndex..<endIndex)
+        let readBytes = endIndex - startIndex
+        dataCursor += readBytes
+        return readBytes
+    }
+    mutating func readNativeValue<T>(_ value: UnsafeMutablePointer<T>) -> Bool {
         let size = MemoryLayout<T>.size
         return value.withMemoryRebound(to: UInt8.self, capacity: size) {
             self.read($0, maxLength: size) == size
         }
     }
-    func appendNativeValues<T>(to array: inout [T], count: Int) -> Bool {
+    mutating func appendNativeValues<T>(to array: inout [T], count: Int) -> Bool {
         guard count > 0 else { return true }
         let size = count * MemoryLayout<T>.stride
         let buffer = UnsafeMutableBufferPointer<UInt8>.allocate(capacity: size)
@@ -65,8 +79,7 @@ public extension Path {
         var commandCount: SerializationTypes.CommandCount = 0
         var commands: [SerializationTypes.Command] = []
 
-        let stream = InputStream(data: data)
-        stream.open()
+        var stream = DataStream(data: data)
 
         // check the magic number
         var magic = SerializationTypes.MagicNumber.max
@@ -148,4 +161,3 @@ public extension Path {
         return result
     }
 }
-#endif

BezierKit/Library/Path.swift

@@ -33,7 +33,7 @@ internal func windingCountImpliesContainment(_ count: Int, using rule: PathFillR
     }
 }
 
-open class Path: NSObject, NSSecureCoding {
+open class Path: NSObject {
     /// lock to make external accessing of lazy vars threadsafe
     private let lock = UnfairLock()
 
@@ -352,7 +352,6 @@ open class Path: NSObject, NSSecureCoding {
         return outerComponents.values.map { Path(components: $0) }
     }
 
-    #if !os(WASI)
     public override var hash: Int {
         // override is needed because NSObject hashing is independent of Swift's Hashable
         return lock.sync {
@@ -366,9 +365,12 @@ open class Path: NSObject, NSSecureCoding {
             return h
         }
     }
-    #endif
 }
 
+#if !os(WASI)
+extension Path: NSSecureCoding {}
+#endif
+
 extension Path: Transformable {
     public func copy(using t: CGAffineTransform) -> Self {
         return type(of: self).init(components: self.components.map { $0.copy(using: t)})

BezierKit/Library/Utils.swift

@@ -308,6 +308,21 @@ internal class Utils {
         return atan2(d1.cross(d2), d1.dot(d2))
     }
 
+    @inline(__always) private static func shouldRecurse<C>(for subcurve: Subcurve<C>, boundingBoxSize: CGPoint, accuracy: CGFloat) -> Bool {
+        guard subcurve.canSplit else { return false }
+        guard boundingBoxSize.x + boundingBoxSize.y >= accuracy else { return false }
+        if MemoryLayout<CGFloat>.size == 4 {
+            let curve = subcurve.curve
+            // limit recursion when we exceed Float32 precision
+            let midPoint = curve.point(at: 0.5)
+            if midPoint == curve.startingPoint ||
+                midPoint == curve.endingPoint {
+                guard curve.selfIntersects else { return false }
+            }
+        }
+        return true
+    }
+
     // disable this SwiftLint warning about function having more than 5 parameters
     // swiftlint:disable function_parameter_count
 
@@ -325,12 +340,8 @@ internal class Utils {
         guard results.count <= maximumIntersections else { return false }
         guard c1b.overlaps(c2b) else { return true }
 
-        let canSplit1 = c1.canSplit
-        let canSplit2 = c2.canSplit
-        let size1 = c1b.size
-        let size2 = c2b.size
-        let shouldRecurse1 = canSplit1 && ((size1.x + size1.y) >= accuracy)
-        let shouldRecurse2 = canSplit2 && ((size2.x + size2.y) >= accuracy)
+        let shouldRecurse1 = shouldRecurse(for: c1, boundingBoxSize: c1b.size, accuracy: accuracy)
+        let shouldRecurse2 = shouldRecurse(for: c2, boundingBoxSize: c2b.size, accuracy: accuracy)
 
         if shouldRecurse1 == false, shouldRecurse2 == false {
             // subcurves are small enough or we simply cannot recurse any more

README.md

@@ -44,7 +44,7 @@ To integrate BezierKit into your Xcode project using CocoaPods, add it to your t
 
 ```ruby
 target '<Your Target Name>' do
-    pod 'BezierKit', '>= 0.14.0'
+    pod 'BezierKit', '>= 0.15.0'
 end
 ```
 
@@ -66,7 +66,7 @@ import PackageDescription
 let package = Package(
     name: "<Your Target Name>",
     dependencies: [
-        .package(url: "https://github.com/hfutrell/BezierKit.git", from: "0.14.0"),
+        .package(url: "https://github.com/hfutrell/BezierKit.git", from: "0.15.0"),
     ]
 )
 ```