d2d1: Properly handle the candidate being the last vertex before the base edge…

d2d1: Properly handle the candidate being the last vertex before the base edge origin in d2d_cdt_fixup(). Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>

d2d1: Properly handle the candidate being the last vertex before the base edge…
f35bfff4 · Henri Verbeet · Alexandre Julliard · c5480a88 · f35bfff4
Commit f35bfff4 authored Oct 06, 2015 by Henri Verbeet Committed by Alexandre Julliard Oct 07, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

geometry.c dlls/d2d1/geometry.c +6 -1

No files found.
--- a/dlls/d2d1/geometry.c
+++ b/dlls/d2d1/geometry.c
@@ -712,7 +712,12 @@ static BOOL d2d_cdt_fixup(struct d2d_cdt *cdt, const struct d2d_cdt_edge_ref *ba

    if (count > 1)
    {
-        if (!d2d_cdt_connect(cdt, &new_base, &candidate, base_edge))
+        d2d_cdt_edge_next_left(cdt, &next, &candidate);
+        if (d2d_cdt_edge_destination(cdt, &next) == d2d_cdt_edge_origin(cdt, base_edge))
+            d2d_cdt_edge_next_left(cdt, &next, base_edge);
+        else
+            next = *base_edge;
+        if (!d2d_cdt_connect(cdt, &new_base, &candidate, &next))
            return FALSE;
        if (!d2d_cdt_fixup(cdt, &new_base))
            return FALSE;