Merge pull request #355 from f3dm76/task/pathsM

Fix #354: Paths with multiple M pairs are drawn incorrectly
exyte · May 14, 2018 · 7c03c5d · 7c03c5d
2 parents 73ae965 + 011d4f0
commit 7c03c5d
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/Source/svg/SVGParser.swift b/Source/svg/SVGParser.swift
@@ -1404,14 +1404,23 @@ private class PathDataReader {
             var result = [PathSegment]()
             let data = readData()
             var index = 0
-            while (index < data.count) {
+            var isFirstSegment = true
+            while index < data.count {
                 let end = index + count
-                if (end > data.count) {
+                if end > data.count {
                     // TODO need to generate error:
                     // "Path '\(type)' has invalid number of arguments: \(data.count)"
                     break
                 }
-                result.append(PathSegment(type: type, data: Array(data[index..<end])))
+                var currentType = type
+                if type == .M && !isFirstSegment {
+                    currentType = .L
+                }
+                if type == .m && !isFirstSegment {
+                    currentType = .l
+                }
+                result.append(PathSegment(type: currentType, data: Array(data[index..<end])))
+                isFirstSegment = false
                 index = end
             }
             return result