3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Clipper 6.2.9. Fixes #2639

Browse Source
This commit is contained in:
Alessandro Ranellucci 2015-02-22 15:13:52 +01:00
parent 5021c9605b
commit edbc11477c
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xs/src/clipper.cpp
View File

@ -1,8 +1,8 @@
/******************************************************************************* /*******************************************************************************
* * * *
* Author : Angus Johnson * * Author : Angus Johnson *
* Version : 6.2.8 * * Version : 6.2.9 *
* Date : 10 February 2015 * * Date : 16 February 2015 *
* Website : http://www.angusj.com * * Website : http://www.angusj.com *
* Copyright : Angus Johnson 2010-2015 * * Copyright : Angus Johnson 2010-2015 *
* * * *
@ -969,8 +969,6 @@ TEdge* ClipperBase::ProcessBound(TEdge* E, bool NextIsForward)
EStart = E->Prev; EStart = E->Prev;
else else
EStart = E->Next; 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) if (EStart->Bot.X != E->Bot.X && EStart->Top.X != E->Bot.X)
@ -979,7 +977,6 @@ TEdge* ClipperBase::ProcessBound(TEdge* E, bool NextIsForward)
else if (EStart->Bot.X != E->Bot.X) else if (EStart->Bot.X != E->Bot.X)
ReverseHorizontal(*E); ReverseHorizontal(*E);
} }
}
EStart = E; EStart = E;
if (NextIsForward) if (NextIsForward)

4
xs/src/clipper.hpp
View File

@ -1,8 +1,8 @@
/******************************************************************************* /*******************************************************************************
* * * *
* Author : Angus Johnson * * Author : Angus Johnson *
* Version : 6.2.8 * * Version : 6.2.9 *
* Date : 10 February 2015 * * Date : 16 February 2015 *
* Website : http://www.angusj.com * * Website : http://www.angusj.com *
* Copyright : Angus Johnson 2010-2015 * * Copyright : Angus Johnson 2010-2015 *
* * * *

6
xs/t/11_clipper.t
View File

@ -4,7 +4,7 @@ use strict;
use warnings; use warnings;
use Slic3r::XS; use Slic3r::XS;
use Test::More tests => 21; use Test::More tests => 23;
my $square = Slic3r::Polygon->new( # ccw my $square = Slic3r::Polygon->new( # ccw
[200, 100], [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'; is scalar(@{$result->[0]}), 5, 'intersection_pl - result is not empty';
} }
if (0) { if (1) {
# Disabled until Clipper bug ### is fixed # Disabled until Clipper bug #126 is fixed
my $subject = Slic3r::Polyline->new( my $subject = Slic3r::Polyline->new(
[200000,19799999],[200000,200000],[24304692,200000],[15102879,17506106],[13883200,19799999],[200000,19799999], [200000,19799999],[200000,200000],[24304692,200000],[15102879,17506106],[13883200,19799999],[200000,19799999],
); );