Bug fixes for libraries (lispkit pdf), (lispkit image), and (lispkit vision). Fix legacy PDF example code.

Author: objecthub

LispKit.xcodeproj/project.pbxproj

@@ -73,7 +73,7 @@
 		CC0E57C6268FAAE800693DD2 /* 223.sld in Copy pre-installed SRFI libraries */ = {isa = PBXBuildFile; fileRef = CC0E57C2268FAA4200693DD2 /* 223.sld */; };
 		CC0E57C7268FAAFB00693DD2 /* SRFI-223.scm in Copy tests */ = {isa = PBXBuildFile; fileRef = CC0E57C3268FAA7800693DD2 /* SRFI-223.scm */; };
 		CC0EBFF91ED37FB7004510B2 /* Math.scm in Copy examples */ = {isa = PBXBuildFile; fileRef = CC0EBFF81ED37A76004510B2 /* Math.scm */; };
-		CC10404D1F53789D0045144A /* pdf.sld in Copy pre-installed LispKit libraries */ = {isa = PBXBuildFile; fileRef = CC10404C1F5378660045144A /* pdf.sld */; };
+		CC10404D1F53789D0045144A /* legacy.sld in Copy pre-installed LispKit libraries */ = {isa = PBXBuildFile; fileRef = CC10404C1F5378660045144A /* legacy.sld */; };
 		CC131C4C1CDE0C3D006C030C /* SyntaxRules.scm in Resources */ = {isa = PBXBuildFile; fileRef = CC131C4B1CDE0C3D006C030C /* SyntaxRules.scm */; };
 		CC131C4E1CDE0DCA006C030C /* RegressionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC131C4D1CDE0DCA006C030C /* RegressionTests.swift */; };
 		CC131C501CDE0E01006C030C /* LispKitTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC131C4F1CDE0E01006C030C /* LispKitTestCase.swift */; };
@@ -872,7 +872,7 @@
 		CCC48D9E25E9806600D082AD /* prettify.sld in Copy pre-installed LispKit libraries */ = {isa = PBXBuildFile; fileRef = CC750BD91F5B772200CD82A2 /* prettify.sld */; };
 		CCC48D9F25E9806600D082AD /* csv.sld in Copy pre-installed LispKit libraries */ = {isa = PBXBuildFile; fileRef = CCBD755D21E224A7008CD7C8 /* csv.sld */; };
 		CCC48DA025E9806600D082AD /* deprecated.sld in Copy pre-installed LispKit libraries */ = {isa = PBXBuildFile; fileRef = CC3A02591F97F3E1009B959C /* deprecated.sld */; };
-		CCC48DA125E9806600D082AD /* pdf.sld in Copy pre-installed LispKit libraries */ = {isa = PBXBuildFile; fileRef = CC10404C1F5378660045144A /* pdf.sld */; };
+		CCC48DA125E9806600D082AD /* legacy.sld in Copy pre-installed LispKit libraries */ = {isa = PBXBuildFile; fileRef = CC10404C1F5378660045144A /* legacy.sld */; };
 		CCC48DA225E9806600D082AD /* clos.sld in Copy pre-installed LispKit libraries */ = {isa = PBXBuildFile; fileRef = CC703A1A218D09B600E71EA9 /* clos.sld */; };
 		CCC48DA325E9806600D082AD /* prolog.sld in Copy pre-installed LispKit libraries */ = {isa = PBXBuildFile; fileRef = CCD3E15325C5EB83007FCE8A /* prolog.sld */; };
 		CCC48DA425E9806600D082AD /* logic.sld in Copy pre-installed LispKit libraries */ = {isa = PBXBuildFile; fileRef = CC436C3F1FFBD5090095559E /* logic.sld */; };
@@ -1785,7 +1785,7 @@
 				CCE7CA461F8EC07000FD7ECA /* iterate.sld in Copy pre-installed LispKit libraries */,
 				CC2345411F655BD800C38817 /* datatype.sld in Copy pre-installed LispKit libraries */,
 				CC750BDA1F5B776700CD82A2 /* prettify.sld in Copy pre-installed LispKit libraries */,
-				CC10404D1F53789D0045144A /* pdf.sld in Copy pre-installed LispKit libraries */,
+				CC10404D1F53789D0045144A /* legacy.sld in Copy pre-installed LispKit libraries */,
 				CC72862D1F52B32C00EEBC58 /* heap.sld in Copy pre-installed LispKit libraries */,
 				CC5848031E56920600BE6497 /* set.sld in Copy pre-installed LispKit libraries */,
 			);
@@ -2457,7 +2457,7 @@
 				CCC48D9E25E9806600D082AD /* prettify.sld in Copy pre-installed LispKit libraries */,
 				CCC48D9F25E9806600D082AD /* csv.sld in Copy pre-installed LispKit libraries */,
 				CCC48DA025E9806600D082AD /* deprecated.sld in Copy pre-installed LispKit libraries */,
-				CCC48DA125E9806600D082AD /* pdf.sld in Copy pre-installed LispKit libraries */,
+				CCC48DA125E9806600D082AD /* legacy.sld in Copy pre-installed LispKit libraries */,
 				CCC48DA225E9806600D082AD /* clos.sld in Copy pre-installed LispKit libraries */,
 				CCC48DA325E9806600D082AD /* prolog.sld in Copy pre-installed LispKit libraries */,
 				CCC48DA425E9806600D082AD /* logic.sld in Copy pre-installed LispKit libraries */,
@@ -3158,7 +3158,7 @@
 		CC0E57C2268FAA4200693DD2 /* 223.sld */ = {isa = PBXFileReference; lastKnownFileType = text; path = 223.sld; sourceTree = "<group>"; };
 		CC0E57C3268FAA7800693DD2 /* SRFI-223.scm */ = {isa = PBXFileReference; lastKnownFileType = text; path = "SRFI-223.scm"; sourceTree = "<group>"; };
 		CC0EBFF81ED37A76004510B2 /* Math.scm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Math.scm; sourceTree = "<group>"; };
-		CC10404C1F5378660045144A /* pdf.sld */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = pdf.sld; sourceTree = "<group>"; };
+		CC10404C1F5378660045144A /* legacy.sld */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = legacy.sld; sourceTree = "<group>"; };
 		CC131C4B1CDE0C3D006C030C /* SyntaxRules.scm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SyntaxRules.scm; sourceTree = "<group>"; };
 		CC131C4D1CDE0DCA006C030C /* RegressionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RegressionTests.swift; sourceTree = "<group>"; };
 		CC131C4F1CDE0E01006C030C /* LispKitTestCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = LispKitTestCase.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
@@ -4231,7 +4231,6 @@
 				CC750BD91F5B772200CD82A2 /* prettify.sld */,
 				CC8BBA2926BF38F200552B8F /* text-table.sld */,
 				CCBD755D21E224A7008CD7C8 /* csv.sld */,
-				CC10404C1F5378660045144A /* pdf.sld */,
 				CC703A1A218D09B600E71EA9 /* clos.sld */,
 				CCD3E15325C5EB83007FCE8A /* prolog.sld */,
 				CC436C3F1FFBD5090095559E /* logic.sld */,
@@ -4245,6 +4244,7 @@
 				CC703A1B218D09D100E71EA9 /* clos */,
 				CC26AD3E21470AC90090D9EE /* draw */,
 				CC421D392D478698006AED19 /* image */,
+				CCFFD5892D4D9AB60092150E /* pdf */,
 				CC240E8A24FB144500FF6D0F /* sxml */,
 			);
 			path = lispkit;
@@ -5103,6 +5103,14 @@
 			path = Examples;
 			sourceTree = "<group>";
 		};
+		CCFFD5892D4D9AB60092150E /* pdf */ = {
+			isa = PBXGroup;
+			children = (
+				CC10404C1F5378660045144A /* legacy.sld */,
+			);
+			path = pdf;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */

LispKit.xcodeproj/xcshareddata/xcschemes/LispKitRepl.xcscheme

@@ -81,6 +81,11 @@
             value = "xcode"
             isEnabled = "YES">
          </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "CG_PDF_VERBOSE"
+            value = "true"
+            isEnabled = "YES">
+         </EnvironmentVariable>
       </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction

README.md

@@ -101,6 +101,9 @@ _LispKit_ provides support for the following core features, many of which are ba
     [`(lispkit draw turtle)`](https://github.com/objecthub/swift-lispkit/wiki/LispKit-Draw-Turtle),
     [`(lispkit draw barcode)`](https://github.com/objecthub/swift-lispkit/wiki/LispKit-Draw-Barcode),
     [`(lispkit draw chart bar)`](https://github.com/objecthub/swift-lispkit/wiki/LispKit-Draw-Chart-Bar),
+    [`(lispkit image)`](https://github.com/objecthub/swift-lispkit/wiki/LispKit-Image),
+    [`(lispkit image process)`](https://github.com/objecthub/swift-lispkit/wiki/LispKit-Image-Process),
+    [`(lispkit vision)`](https://github.com/objecthub/swift-lispkit/wiki/LispKit-Vision),
     [`(lispkit styled-text)`](https://github.com/objecthub/swift-lispkit/wiki/LispKit-Styled-Text),
     [`(lispkit datatype)`](https://github.com/objecthub/swift-lispkit/wiki/LispKit-Datatype),
     [`(lispkit object)`](https://github.com/objecthub/swift-lispkit/wiki/LispKit-Object),

Sources/LispKit/Graphics/Drawing.swift

@@ -413,9 +413,12 @@ public enum DrawingInstruction: CustomStringConvertible {
           case .boundingBox(let box):
             textRect = box
         }
+        let context = context.cgContext
+        context.saveGState()
         str.draw(with: textRect,
                  options: [.usesLineFragmentOrigin, .usesFontLeading],
                  attributes: attributes)
+        context.restoreGState()
       case .attributedText(let attribStr, let location):
         let textRect: NSRect
         switch location {

Sources/LispKit/Graphics/Drawing_iOS.swift

@@ -451,16 +451,20 @@ public enum DrawingInstruction: CustomStringConvertible, @unchecked Sendable {
             textRect = box
         }
         if let current = UIGraphicsGetCurrentContext(), current == context {
+          context.saveGState()
           str.draw(with: textRect,
                    options: [.usesLineFragmentOrigin, .usesFontLeading],
                    attributes: attributes,
                    context: nil)
+          context.restoreGState()
         } else {
           UIGraphicsPushContext(context)
+          context.saveGState()
           str.draw(with: textRect,
                    options: [.usesLineFragmentOrigin, .usesFontLeading],
                    attributes: attributes,
                    context: nil)
+          context.restoreGState()
           UIGraphicsPopContext()
         }
       case .attributedText(let attribStr, let location):

Sources/LispKit/Primitives/ImageLibrary.swift

@@ -991,31 +991,50 @@ public final class ImageLibrary: NativeLibrary {
   private func applyImageFilter(expr: Expr, args: Arguments) throws -> Expr {
     var image = try self.abstractImage(from: expr).ciImage
     for a in args {
+      if case .null = a {
+        continue
+      }
       var list = a
-      if case .pair(.symbol(_), _) = a {
-        list = .pair(a, .null)
+      switch a {
+        case .pair(.symbol(_), _):
+          list = .pair(a, .null)
+        case .object(_):
+          list = .pair(a, .null)
+        default:
+          break
       }
       while case .pair(let arg, let rest) = list {
-        guard case .pair(let ident, let params) = arg else {
-          throw RuntimeError.type(arg, expected: [.pairType])
-        }
-        let name: String
-        if case .symbol(let sym) = ident {
-          guard let mappedName = self.filterName[sym] else {
-            return .false
-          }
-          name = mappedName
-        } else {
-          name = try ident.asString()
-        }
-        guard let filter = CIFilter(name: name,
-                                    parameters: try self.parameters(from: params, input: image)) else {
-          return .false
-        }
-        if let outputImage = filter.outputImage {
-          image = outputImage
-        } else {
-          return .false
+        switch arg {
+          case .object(_):
+            let ciFilter = try self.imageFilter(from: arg).ciFilter
+            ciFilter.setValue(image, forKey: kCIInputImageKey)
+            if let outputImage = ciFilter.outputImage {
+              image = outputImage
+            } else {
+              return .false
+            }
+          case .pair(let ident, let params):
+            let name: String
+            if case .symbol(let sym) = ident {
+              guard let mappedName = self.filterName[sym] else {
+                return .false
+              }
+              name = mappedName
+            } else {
+              name = try ident.asString()
+            }
+            guard let filter = CIFilter(name: name,
+                                        parameters: try self.parameters(from: params, input: image)) else {
+              return .false
+            }
+            if let outputImage = filter.outputImage {
+              image = outputImage
+            } else {
+              return .false
+            }
+          default:
+            Swift.print("falling through: \(arg)")
+            throw RuntimeError.type(arg, expected: [.pairType])
         }
         list = rest
       }