Module: wine Branch: master Commit: 86cdcb6994389ad0a89c72001635e8aa6cd6bb80 URL: https://gitlab.winehq.org/wine/wine/-/commit/86cdcb6994389ad0a89c72001635e8a...
Author: Bartosz Kosiorek gang65@poczta.onet.pl Date: Fri Oct 27 18:11:16 2023 +0200
gdiplus: Fix default tension for GdipAddPathCurve and GdipAddPathClosedCurve.
---
dlls/gdiplus/graphicspath.c | 8 ++++---- dlls/gdiplus/tests/graphicspath.c | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 54234ea0bd6..74fdfa6cf45 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -421,7 +421,7 @@ GpStatus WINGDIPAPI GdipAddPathClosedCurve(GpPath *path, GDIPCONST GpPointF *poi { TRACE("(%p, %p, %d)\n", path, points, count);
- return GdipAddPathClosedCurve2(path, points, count, 1.0); + return GdipAddPathClosedCurve2(path, points, count, 0.5); }
GpStatus WINGDIPAPI GdipAddPathClosedCurveI(GpPath *path, GDIPCONST GpPoint *points, @@ -429,7 +429,7 @@ GpStatus WINGDIPAPI GdipAddPathClosedCurveI(GpPath *path, GDIPCONST GpPoint *poi { TRACE("(%p, %p, %d)\n", path, points, count);
- return GdipAddPathClosedCurve2I(path, points, count, 1.0); + return GdipAddPathClosedCurve2I(path, points, count, 0.5); }
GpStatus WINGDIPAPI GdipAddPathClosedCurve2(GpPath *path, GDIPCONST GpPointF *points, @@ -537,7 +537,7 @@ GpStatus WINGDIPAPI GdipAddPathCurve(GpPath *path, GDIPCONST GpPointF *points, I if(!path || !points || count <= 1) return InvalidParameter;
- return GdipAddPathCurve2(path, points, count, 1.0); + return GdipAddPathCurve2(path, points, count, 0.5); }
GpStatus WINGDIPAPI GdipAddPathCurveI(GpPath *path, GDIPCONST GpPoint *points, INT count) @@ -547,7 +547,7 @@ GpStatus WINGDIPAPI GdipAddPathCurveI(GpPath *path, GDIPCONST GpPoint *points, I if(!path || !points || count <= 1) return InvalidParameter;
- return GdipAddPathCurve2I(path, points, count, 1.0); + return GdipAddPathCurve2I(path, points, count, 0.5); }
GpStatus WINGDIPAPI GdipAddPathCurve2(GpPath *path, GDIPCONST GpPointF *points, INT count, diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 5e37d0a2f18..238305c3c24 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -921,14 +921,14 @@ static path_test_t addcurve_path[] = { }; static path_test_t addcurve_path_default_tension[] = { {0.0, 0.0, PathPointTypeStart, 0, 0}, /*0*/ - {1.66, 1.66, PathPointTypeBezier, 0, 1}, /*1*/ - {8.33, 6.66, PathPointTypeBezier, 0, 1}, /*2*/ + {1.66, 1.66, PathPointTypeBezier, 0, 0}, /*1*/ + {8.33, 6.66, PathPointTypeBezier, 0, 0}, /*2*/ {10.0, 10.0, PathPointTypeBezier, 0, 0}, /*3*/ - {11.6, 13.3, PathPointTypeBezier, 0, 1}, /*4*/ - {6.66, 20.0, PathPointTypeBezier, 0, 1}, /*5*/ + {11.6, 13.3, PathPointTypeBezier, 0, 0}, /*4*/ + {6.66, 20.0, PathPointTypeBezier, 0, 0}, /*5*/ {10.0, 20.0, PathPointTypeBezier, 0, 0}, /*6*/ - {13.3, 20.0, PathPointTypeBezier, 0, 1}, /*7*/ - {26.6, 11.6, PathPointTypeBezier, 0, 1}, /*8*/ + {13.3, 20.0, PathPointTypeBezier, 0, 0}, /*7*/ + {26.6, 11.6, PathPointTypeBezier, 0, 0}, /*8*/ {30.0, 10.0, PathPointTypeBezier, 0, 0} /*9*/ }; static path_test_t addcurve_path2[] = { @@ -1051,17 +1051,17 @@ static path_test_t addclosedcurve_path[] = { }; static path_test_t addclosedcurve_path_default_tension[] = { {0.0, 0.0, PathPointTypeStart, 0, 0}, /*0*/ - {-3.33, 0.0, PathPointTypeBezier, 0, 1}, /*1*/ - {8.33, 6.66, PathPointTypeBezier, 0, 1}, /*2*/ + {-3.33, 0.0, PathPointTypeBezier, 0, 0}, /*1*/ + {8.33, 6.66, PathPointTypeBezier, 0, 0}, /*2*/ {10.0, 10.0, PathPointTypeBezier, 0, 0}, /*3*/ - {11.6, 13.3, PathPointTypeBezier, 0, 1}, /*4*/ - {6.66, 20.0, PathPointTypeBezier, 0, 1}, /*5*/ + {11.6, 13.3, PathPointTypeBezier, 0, 0}, /*4*/ + {6.66, 20.0, PathPointTypeBezier, 0, 0}, /*5*/ {10.0, 20.0, PathPointTypeBezier, 0, 0}, /*6*/ - {13.3, 20.0, PathPointTypeBezier, 0, 1}, /*7*/ - {31.6, 13.3, PathPointTypeBezier, 0, 1}, /*8*/ + {13.3, 20.0, PathPointTypeBezier, 0, 0}, /*7*/ + {31.6, 13.3, PathPointTypeBezier, 0, 0}, /*8*/ {30.0, 10.0, PathPointTypeBezier, 0, 0}, /*9*/ - {28.3, 6.66, PathPointTypeBezier, 0, 1}, /*10*/ - {3.33, 0.0, PathPointTypeBezier, 0, 1}, /*11*/ + {28.3, 6.66, PathPointTypeBezier, 0, 0}, /*10*/ + {3.33, 0.0, PathPointTypeBezier, 0, 0}, /*11*/ {0.0, 0.0, PathPointTypeBezier | PathPointTypeCloseSubpath, 0, 0} /*12*/ }; static void test_addclosedcurve(void)