Merge branch 'horizontals'

[swftools.git] / lib / gfxpoly / wind.c

diff --git a/lib/gfxpoly/wind.c b/lib/gfxpoly/wind.c
index f0eb110..30a21fd 100644 (file)
--- a/lib/gfxpoly/wind.c
+++ b/lib/gfxpoly/wind.c
@@ -35,9 +35,6 @@ windrule_t windrule_evenodd = {
 
 // -------------------- circular ----------------------
 
-edgestyle_t edgestyle_down;
-edgestyle_t edgestyle_up;
-
 windstate_t circular_start(windcontext_t*context)
 {
     return windstate_nonfilled;
@@ -58,13 +55,10 @@ windstate_t circular_add(windcontext_t*context, windstate_t left, edgestyle_t*ed
 
 edgestyle_t* circular_diff(windstate_t*left, windstate_t*right)
 {
-    if(left->is_filled==right->is_filled) {
+    if(left->is_filled==right->is_filled)
         return 0;
-    } else if(left->is_filled) {
-        return &edgestyle_down;
-    } else {//right->is_filled
-        return &edgestyle_up;
-    }
+    else
+        return &edgestyle_default;
 }
 
 windrule_t windrule_circular = {