Commit 6a6aa313 authored by Vincent Povirk's avatar Vincent Povirk Committed by Alexandre Julliard

gdiplus: Fix GdipWidenPath transform for non-pixel pens.

parent 91352c5a
...@@ -2074,7 +2074,7 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, ...@@ -2074,7 +2074,7 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix,
status = GdipClonePath(path, &flat_path); status = GdipClonePath(path, &flat_path);
if (status == Ok) if (status == Ok)
status = GdipFlattenPath(flat_path, matrix, flatness); status = GdipFlattenPath(flat_path, pen->unit == UnitPixel ? matrix : NULL, flatness);
if (status == Ok && !init_path_list(&points, 314.0, 22.0)) if (status == Ok && !init_path_list(&points, 314.0, 22.0))
status = OutOfMemory; status = OutOfMemory;
...@@ -2147,6 +2147,9 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, ...@@ -2147,6 +2147,9 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix,
GdipDeletePath(flat_path); GdipDeletePath(flat_path);
if (status == Ok && pen->unit != UnitPixel)
status = GdipTransformPath(path, matrix);
return status; return status;
} }
......
...@@ -1056,10 +1056,10 @@ static path_test_t widenline_path[] = { ...@@ -1056,10 +1056,10 @@ static path_test_t widenline_path[] = {
}; };
static path_test_t widenline_wide_path[] = { static path_test_t widenline_wide_path[] = {
{5.0, 0.0, PathPointTypeStart, 0, 1}, /*0*/ {5.0, 0.0, PathPointTypeStart, 0, 0}, /*0*/
{50.0, 0.0, PathPointTypeLine, 0, 1}, /*1*/ {50.0, 0.0, PathPointTypeLine, 0, 0}, /*1*/
{50.0, 20.0, PathPointTypeLine, 0, 1}, /*2*/ {50.0, 20.0, PathPointTypeLine, 0, 0}, /*2*/
{5.0, 20.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 1} /*3*/ {5.0, 20.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0} /*3*/
}; };
static void test_widen(void) static void test_widen(void)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment