Henri Verbeet : d2d1: Properly handle collinear edges in d2d_cdt_cut_edges ().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c125612cbbda881b8194e46b08718ef1b284429c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c125612cbbda881b8194e46b08718ef1b284429c

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Fri Oct 23 13:46:23 2015 +0200

d2d1: Properly handle collinear edges in d2d_cdt_cut_edges().

Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/d2d1/geometry.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c
index 3919080..198e5d6 100644
--- a/dlls/d2d1/geometry.c
+++ b/dlls/d2d1/geometry.c
@@ -1314,6 +1314,7 @@ static void d2d_cdt_cut_edges(struct d2d_cdt *cdt, struct d2d_cdt_edge_ref *end_
         const struct d2d_cdt_edge_ref *base_edge, size_t start_vertex, size_t end_vertex)
 {
     struct d2d_cdt_edge_ref next;
+    float ccw;
 
     d2d_cdt_edge_next_left(cdt, &next, base_edge);
     if (d2d_cdt_edge_destination(cdt, &next) == end_vertex)
@@ -1322,7 +1323,14 @@ static void d2d_cdt_cut_edges(struct d2d_cdt *cdt, struct d2d_cdt_edge_ref *end_
         return;
     }
 
-    if (d2d_cdt_ccw(cdt, d2d_cdt_edge_destination(cdt, &next), end_vertex, start_vertex) > 0.0f)
+    ccw = d2d_cdt_ccw(cdt, d2d_cdt_edge_destination(cdt, &next), end_vertex, start_vertex);
+    if (ccw == 0.0f)
+    {
+        *end_edge = next;
+        return;
+    }
+
+    if (ccw > 0.0f)
         d2d_cdt_edge_next_left(cdt, &next, &next);
 
     d2d_cdt_edge_sym(&next, &next);
@@ -1333,7 +1341,7 @@ static void d2d_cdt_cut_edges(struct d2d_cdt *cdt, struct d2d_cdt_edge_ref *end_
 static BOOL d2d_cdt_insert_segment(struct d2d_cdt *cdt, struct d2d_geometry *geometry,
         const struct d2d_cdt_edge_ref *origin, struct d2d_cdt_edge_ref *edge, size_t end_vertex)
 {
-    struct d2d_cdt_edge_ref base_edge, current, next, target;
+    struct d2d_cdt_edge_ref base_edge, current, new_origin, next, target;
 
     for (current = *origin;; current = next)
     {
@@ -1362,7 +1370,10 @@ static BOOL d2d_cdt_insert_segment(struct d2d_cdt *cdt, struct d2d_geometry *geo
             if (!d2d_cdt_fixup(cdt, &base_edge))
                 return FALSE;
 
-            return TRUE;
+            if (d2d_cdt_edge_origin(cdt, edge) == end_vertex)
+                return TRUE;
+            new_origin = *edge;
+            return d2d_cdt_insert_segment(cdt, geometry, &new_origin, edge, end_vertex);
         }
 
         if (next.idx == origin->idx)