[PATCH 0/3] MR10814: d2d1: Fix coordinate in arc-to-bezier conversion for degenerate case.

[Nikolay Sivov (＠nsivov)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=59718
Signed-off-by: Giang Nguyen <[e-mail]>
Signed-off-by: Nikolay Sivov <[e-mail]>

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

[PATCH 1/3] d2d1: Fix coordinate in arc-to-bezier conversion for degenerate case.

[Giang Nguyen]

From: Giang Nguyen <[e-mail]>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=59718
Signed-off-by: Giang Nguyen <[e-mail]>
Signed-off-by: Nikolay Sivov <[e-mail]>
---
 dlls/d2d1/geometry.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c
index 68de4c2193c..51d587673dd 100644
--- a/dlls/d2d1/geometry.c
+++ b/dlls/d2d1/geometry.c
@@ -1247,6 +1247,7 @@ static int d2d_arc_to_bezier(const D2D_POINT_2F *start_point, const D2D1_ARC_SEG
     if (!d2d_arc_check_radius(rHalfChord2, fuzz2, &radius.x) ||
         !d2d_arc_check_radius(rHalfChord2, fuzz2, &radius.y))
     {
+        points[0] = arc->point;
         return 0;
     }
 
-- 
GitLab


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

[PATCH 2/3] d2d1: Fix arc center translation in arc-to-bezier conversion.

[Giang Nguyen]

From: Giang Nguyen <[e-mail]>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=59718
Signed-off-by: Giang Nguyen <[e-mail]>
Signed-off-by: Nikolay Sivov <[e-mail]>
---
 dlls/d2d1/geometry.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c
index 51d587673dd..a793e298c2f 100644
--- a/dlls/d2d1/geometry.c
+++ b/dlls/d2d1/geometry.c
@@ -1312,7 +1312,7 @@ static int d2d_arc_to_bezier(const D2D_POINT_2F *start_point, const D2D1_ARC_SEG
     m._32 = 0.5f * (arc->point.y + start_point->y);
     if (!zero_center)
     {
-        m._31 += (m._11 * center.x + m._12 * center.x);
+        m._31 += (m._11 * center.x + m._12 * center.y);
         m._32 += (m._21 * center.x + m._22 * center.y);
     }
 
-- 
GitLab


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

[PATCH 3/3] d2d1: Do not translate radius vectors in arc-to-bezier conversion.

[Giang Nguyen]

From: Giang Nguyen <[e-mail]>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=59718
Signed-off-by: Giang Nguyen <[e-mail]>
Signed-off-by: Nikolay Sivov <[e-mail]>
---
 dlls/d2d1/geometry.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c
index a793e298c2f..93816390284 100644
--- a/dlls/d2d1/geometry.c
+++ b/dlls/d2d1/geometry.c
@@ -4480,12 +4480,16 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Open(ID2D1PathGeometry1 *ifac
 
 static inline void d2d_arc_transform(D2D1_ARC_SEGMENT *arc, const D2D1_MATRIX_3X2_F *transform)
 {
+    D2D1_MATRIX_3X2_F m = *transform;
     D2D_POINT_2F point;
 
+    m._31 = 0.0f;
+    m._32 = 0.0f;
+
     d2d_point_transform(&arc->point, transform, arc->point.x, arc->point.y);
-    d2d_point_transform(&point, transform, arc->size.width, 0.0f);
+    d2d_point_transform(&point, &m, arc->size.width, 0.0f);
     arc->size.width = d2d_point_length(&point);
-    d2d_point_transform(&point, transform, 0.0f, arc->size.height);
+    d2d_point_transform(&point, &m, 0.0f, arc->size.height);
     arc->size.height = d2d_point_length(&point);
 }
 
-- 
GitLab

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

[Nikolay Sivov (＠nsivov)]

Strangely I don't see end point initializing for 1-segment case in current WPF source either.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10814#note_138767

[PATCH 0/3] MR10814: d2d1: Fix coordinate in arc-to-bezier conversion for degenerate case. - approved

[Nikolay Sivov (＠nsivov)]

This merge request was approved by Nikolay Sivov.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10814