diff --git a/xs/src/clipper.cpp b/xs/src/clipper.cpp index 3662fd1a5..264896e0b 100644 --- a/xs/src/clipper.cpp +++ b/xs/src/clipper.cpp @@ -1,8 +1,8 @@ /******************************************************************************* * * * Author : Angus Johnson * -* Version : 6.2.8 * -* Date : 10 February 2015 * +* Version : 6.2.9 * +* Date : 16 February 2015 * * Website : http://www.angusj.com * * Copyright : Angus Johnson 2010-2015 * * * @@ -969,16 +969,13 @@ TEdge* ClipperBase::ProcessBound(TEdge* E, bool NextIsForward) EStart = E->Prev; else EStart = E->Next; - if (EStart->OutIdx != Skip) - { - if (IsHorizontal(*EStart)) //ie an adjoining horizontal skip edge + if (IsHorizontal(*EStart)) //ie an adjoining horizontal skip edge { if (EStart->Bot.X != E->Bot.X && EStart->Top.X != E->Bot.X) ReverseHorizontal(*E); } else if (EStart->Bot.X != E->Bot.X) ReverseHorizontal(*E); - } } EStart = E; diff --git a/xs/src/clipper.hpp b/xs/src/clipper.hpp index 874fff1ed..c3151b51b 100644 --- a/xs/src/clipper.hpp +++ b/xs/src/clipper.hpp @@ -1,8 +1,8 @@ /******************************************************************************* * * * Author : Angus Johnson * -* Version : 6.2.8 * -* Date : 10 February 2015 * +* Version : 6.2.9 * +* Date : 16 February 2015 * * Website : http://www.angusj.com * * Copyright : Angus Johnson 2010-2015 * * * diff --git a/xs/t/11_clipper.t b/xs/t/11_clipper.t index ba60d8890..ba12568ed 100644 --- a/xs/t/11_clipper.t +++ b/xs/t/11_clipper.t @@ -4,7 +4,7 @@ use strict; use warnings; use Slic3r::XS; -use Test::More tests => 21; +use Test::More tests => 23; my $square = Slic3r::Polygon->new( # ccw [200, 100], @@ -192,8 +192,8 @@ if (0) { # Clipper does not preserve polyline orientation is scalar(@{$result->[0]}), 5, 'intersection_pl - result is not empty'; } -if (0) { - # Disabled until Clipper bug ### is fixed +if (1) { + # Disabled until Clipper bug #126 is fixed my $subject = Slic3r::Polyline->new( [200000,19799999],[200000,200000],[24304692,200000],[15102879,17506106],[13883200,19799999],[200000,19799999], );