[PATCH 0/1] MR8069: gdiplus: Remove repeated points before widening paths.

[Esme Povirk (＠madewokherd)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58203

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8069

[PATCH 1/1] gdiplus: Remove repeated points before widening paths.

[Esme Povirk]

From: Esme Povirk <esme(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58203
---
 dlls/gdiplus/graphicspath.c | 56 +++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c
index 95b4bcc8882..f9c8d986b14 100644
--- a/dlls/gdiplus/graphicspath.c
+++ b/dlls/gdiplus/graphicspath.c
@@ -2605,6 +2605,60 @@ GpStatus widen_flat_path_anchors(GpPath *flat_path, GpPen *pen, REAL pen_width,
     return stat;
 }
 
+static BOOL points_equal(const PointF* points, int index1, int index2)
+{
+    return !memcmp(&points[index1], &points[index2], sizeof(*points));
+}
+
+static void remove_repeated_points(GpPath *path)
+{
+    int i, j=0, subpath_start=0, subpath_end=0, path_size = 0;
+
+    for (i = 0; i < path->pathdata.Count; i++)
+    {
+        BYTE t = path->pathdata.Types[i];
+
+        path->pathdata.Types[j] = path->pathdata.Types[i];
+        path->pathdata.Points[j] = path->pathdata.Points[i];
+
+        if ((t & PathPointTypePathTypeMask) == PathPointTypeStart)
+        {
+            subpath_start = j;
+            subpath_end = j;
+        }
+        else if ((t & PathPointTypeCloseSubpath) == PathPointTypeCloseSubpath)
+        {
+            if (i > 0 && !points_equal(path->pathdata.Points, i - 1, i) &&
+                !points_equal(path->pathdata.Points, subpath_start, i))
+                subpath_end = j;
+
+            if (subpath_end == subpath_start)
+            {
+                j = subpath_start;
+                continue;
+            }
+
+            path->pathdata.Types[subpath_end] |= PathPointTypeCloseSubpath;
+            j = path_size = subpath_end + 1;
+            continue;
+        }
+        else
+        {
+            if (i > 0 && points_equal(path->pathdata.Points, i - 1, i))
+                continue;
+
+            if (!points_equal(path->pathdata.Points, subpath_start, j))
+                subpath_end = j;
+            
+            path_size = j + 1;
+        }
+
+        j++;
+    }
+
+    path->pathdata.Count = path_size;
+}
+
 GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix,
     REAL flatness)
 {
@@ -2634,6 +2688,8 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix,
         REAL pen_width = (pen->unit == UnitWorld) ? max(pen->width, 1.0) : pen->width;
         BYTE *types = flat_path->pathdata.Types;
 
+        remove_repeated_points(flat_path);
+
         last_point = points;
 
         if (pen->dashcap != DashCapFlat)
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/8069