From 1f996c1382b95e124a0c1525c30d42674678dd44 Mon Sep 17 00:00:00 2001
From: Hermet Park <hermet@lottiefiles.com>
Date: Tue, 26 Mar 2024 23:48:54 +0900
Subject: [PATCH] sw_engine: rectify consecutive line drawings.

There are differences in behavior compared to the SVG spec,
especially when consecutive line drawings occur without a moveTo command
following a closePath command.

Actually, thorvg didn't care the behavior in that scenario,
this update ensures the scenario is handled correctly
to align with the SVG specification.

issue: https://github.com/thorvg/thorvg/issues/1487
---
 .../resources/svg/consecutive_lines.svg       |  1 +
 src/renderer/sw_engine/tvgSwShape.cpp         | 30 +++++++++++++++----
 2 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 src/examples/resources/svg/consecutive_lines.svg

diff --git a/src/examples/resources/svg/consecutive_lines.svg b/src/examples/resources/svg/consecutive_lines.svg
new file mode 100644
index 00000000..1bced4d8
--- /dev/null
+++ b/src/examples/resources/svg/consecutive_lines.svg
@@ -0,0 +1 @@
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="m2 2h12v12H2zl12 12" fill="none" stroke-width="2" stroke="#ffca5f"/></svg>
\ No newline at end of file
diff --git a/src/renderer/sw_engine/tvgSwShape.cpp b/src/renderer/sw_engine/tvgSwShape.cpp
index 46e1a986..acd237ba 100644
--- a/src/renderer/sw_engine/tvgSwShape.cpp
+++ b/src/renderer/sw_engine/tvgSwShape.cpp
@@ -28,6 +28,19 @@
 /* Internal Class Implementation                                        */
 /************************************************************************/
 
+
+static bool _outlineJump(SwOutline& outline)
+{
+    //Make a contour if lineTo/curveTo without calling close/moveTo beforehand.
+    if (!outline.pts.empty()) {
+        outline.cntrs.push(outline.pts.count - 1);
+        outline.pts.push(outline.pts[outline.cntrs.last()]);
+        outline.types.push(SW_CURVE_TYPE_POINT);
+    }
+    return false;
+}
+
+
 static void _outlineEnd(SwOutline& outline)
 {
     if (outline.pts.empty()) return;
@@ -68,20 +81,22 @@ static void _outlineCubicTo(SwOutline& outline, const Point* ctrl1, const Point*
 }
 
 
-static void _outlineClose(SwOutline& outline)
+static bool _outlineClose(SwOutline& outline)
 {
-    uint32_t i = 0;
+    uint32_t i;
 
     if (outline.cntrs.count > 0) i = outline.cntrs.last() + 1;
-    else i = 0;   //First Path
+    else i = 0;
 
     //Make sure there is at least one point in the current path
-    if (outline.pts.count == i) return;
+    if (outline.pts.count == i) return false;
 
     //Close the path
     outline.pts.push(outline.pts[i]);
     outline.types.push(SW_CURVE_TYPE_POINT);
     outline.closed.push(true);
+
+    return true;
 }
 
 
@@ -398,25 +413,28 @@ static bool _genOutline(SwShape* shape, const RenderShape* rshape, const Matrix*
 
     shape->outline = mpoolReqOutline(mpool, tid);
     auto outline = shape->outline;
-
+    bool closed = false;
     //Generate Outlines
     while (cmdCnt-- > 0) {
         switch (*cmds) {
             case PathCommand::Close: {
-                _outlineClose(*outline);
+                if (!closed) closed = _outlineClose(*outline);
                 break;
             }
             case PathCommand::MoveTo: {
+                if (closed) closed = false;
                 _outlineMoveTo(*outline, pts, transform);
                 ++pts;
                 break;
             }
             case PathCommand::LineTo: {
+                if (closed) closed = _outlineJump(*outline);
                 _outlineLineTo(*outline, pts, transform);
                 ++pts;
                 break;
             }
             case PathCommand::CubicTo: {
+                if (closed) closed = _outlineJump(*outline);
                 _outlineCubicTo(*outline, pts, pts + 1, pts + 2, transform);
                 pts += 3;
                 break;