[repsnapper] Fix the bogus patch (fix from upstream)

Miro Hrončok churchyard at fedoraproject.org
Wed Oct 22 15:36:18 UTC 2014


commit 5d1c25a4a31e1cd4fb73c8787c436d7f540f62bc
Author: Miro Hrončok <miro at hroncok.cz>
Date:   Wed Oct 22 17:35:58 2014 +0200

    Fix the bogus patch (fix from upstream)

 repsnapper-clipper620.patch |   16 +++-------------
 1 files changed, 3 insertions(+), 13 deletions(-)
---
diff --git a/repsnapper-clipper620.patch b/repsnapper-clipper620.patch
index 17e3036..c95bc08 100644
--- a/repsnapper-clipper620.patch
+++ b/repsnapper-clipper620.patch
@@ -1,15 +1,5 @@
-From eb3b327c3f8295b363ebcb517496f76b58ae8c36 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro at hroncok.cz>
-Date: Wed, 22 Oct 2014 11:08:06 +0200
-Subject: [PATCH] Replace deprecated OffsetPaths function with ClipperOffset
- class
-
----
- src/slicer/clipping.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
 diff --git a/src/slicer/clipping.cpp b/src/slicer/clipping.cpp
-index 4c68b79..0b2484a 100644
+index 4c68b79..8f3aa73 100644
 --- a/src/slicer/clipping.cpp
 +++ b/src/slicer/clipping.cpp
 @@ -408,7 +408,9 @@ vector<Poly> Clipping::getShrinkedCapped(const vector<Poly> &polys, double dista
@@ -17,9 +7,9 @@ index 4c68b79..0b2484a 100644
    if (reverse)
      CL::ReversePaths(opolys);
 -  CL::OffsetPaths(cpolys, opolys, cldist, cljtype, CL::etClosed, miter_limit);
-+  CL::ClipperOffset co;
++  CL::ClipperOffset co(miter_limit, miter_limit);
 +  co.AddPaths(cpolys, cljtype, CL::etClosedPolygon);
-+  co.Execute(opolys, miter_limit);
++  co.Execute(opolys, cldist);
    CL::SimplifyPolygons(opolys);//, CL::pftNonZero);
    return opolys;
  }


More information about the scm-commits mailing list