Make Bitmap(ppmString:) skip comments in PPM

valeriyvan · May 14, 2024 · 6fac56e · 6fac56e
1 parent 641142f
commit 6fac56e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Sources/geometrize/Bitmap.swift b/Sources/geometrize/Bitmap.swift
@@ -449,7 +449,13 @@ extension Bitmap {
 
     // Format is described in https://en.wikipedia.org/wiki/Netpbm and https://netpbm.sourceforge.net/doc/ppm.html
     public init(ppmString string: String) throws {
-        let scanner = Scanner(string: string)
+        var stringWithTrimmedComments = ""
+        string.enumerateLines { line, _ in
+            let endIndex = line.firstIndex(of: "#") ?? line.endIndex
+            stringWithTrimmedComments.append(line[..<endIndex].trimmingCharacters(in: .whitespacesAndNewlines))
+            stringWithTrimmedComments.append(" ")
+        }
+        let scanner = Scanner(string: stringWithTrimmedComments)
         scanner.charactersToBeSkipped = .whitespacesAndNewlines
         guard scanner.scanString("P3") != nil else {
             throw ParsePpmError.noP3

diff --git a/Tests/geometrizeTests/__Snapshots__/BitmapTests/testInitPpmString.1.png b/Tests/geometrizeTests/__Snapshots__/BitmapTests/testInitPpmString.1.png