[mingw-polyclipping] update to 6.2.0
sailer
sailer at fedoraproject.org
Thu Dec 4 00:17:59 UTC 2014
commit 4302806b23cb78bce5d7dd885488d8577ef30192
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date: Thu Dec 4 01:17:54 2014 +0100
update to 6.2.0
.gitignore | 1 +
mingw-polyclipping.spec | 7 +++-
polyclipping.patch | 84 ++++++++++++++++++++++-------------------------
sources | 2 +-
4 files changed, 46 insertions(+), 48 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6e1625f..2850902 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/clipper_ver5.1.2.zip
/clipper_ver5.1.6.zip
/clipper_ver6.1.3a.zip
+/clipper_ver6.2.0.zip
diff --git a/mingw-polyclipping.spec b/mingw-polyclipping.spec
index a906ff5..8b11d29 100644
--- a/mingw-polyclipping.spec
+++ b/mingw-polyclipping.spec
@@ -9,8 +9,8 @@
%global mingw_pkg_name polyclipping
Name: mingw-%{mingw_pkg_name}
-Version: 6.1.3a
-Release: 2%{?dist}
+Version: 6.2.0
+Release: 1%{?dist}
Summary: MinGW Windows Polygon clipping library
Group: System Environment/Libraries
@@ -132,6 +132,9 @@ mv %{buildroot}/%{mingw64_datadir}/pkgconfig/polyclipping.pc %{buildroot}/%{ming
%{mingw64_libdir}/pkgconfig/polyclipping.pc
%changelog
+* Thu Dec 4 2014 Thomas Sailer <t.sailer at alumni.ethz.ch> - 6.2.0-1
+- update to 6.2.0
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.1.3a-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/polyclipping.patch b/polyclipping.patch
index 5479e23..4983028 100644
--- a/polyclipping.patch
+++ b/polyclipping.patch
@@ -1,5 +1,5 @@
---- cpp/CMakeLists.txt.orig 2014-04-02 17:44:16.532345880 +0200
-+++ cpp/CMakeLists.txt 2014-04-02 17:44:16.532345880 +0200
+--- cpp/CMakeLists.txt.mingw 2014-09-24 09:48:16.000000000 +0200
++++ cpp/CMakeLists.txt 2014-12-04 01:11:46.379187030 +0100
@@ -1,6 +1,8 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.6)
@@ -28,12 +28,12 @@
+INSTALL (TARGETS polyclipping LIBRARY DESTINATION lib RUNTIME DESTINATION bin)
INSTALL (FILES "${PCFILE}" DESTINATION "${CMAKE_INSTALL_PKGCONFIGDIR}")
- SET_TARGET_PROPERTIES(polyclipping PROPERTIES VERSION 16.0.0 SOVERSION 16 )
---- cpp/clipper.hpp.orig 2014-04-02 17:44:16.531345859 +0200
-+++ cpp/clipper.hpp 2014-04-02 17:44:16.530345835 +0200
-@@ -50,6 +50,12 @@
- //which has been replace with the ClipperOffset class.
- #define use_deprecated
+ SET_TARGET_PROPERTIES(polyclipping PROPERTIES VERSION 18.0.0 SOVERSION 18 )
+--- cpp/clipper.hpp.mingw 2014-10-02 08:24:46.000000000 +0200
++++ cpp/clipper.hpp 2014-12-04 01:15:25.406691171 +0100
+@@ -49,6 +49,12 @@
+ //use_deprecated: Enables temporary support for the obsolete functions
+ //#define use_deprecated
+// KB168958
+// disable warnings on 255 char debug symbols
@@ -45,8 +45,8 @@
#include <set>
#include <stdexcept>
@@ -58,6 +64,18 @@
- #include <ostream>
#include <functional>
+ #include <queue>
+#if defined (_WIN32)
+ #if defined(polyclipping_EXPORTS)
@@ -63,8 +63,8 @@
namespace ClipperLib {
enum ClipType { ctIntersection, ctUnion, ctDifference, ctXor };
-@@ -76,7 +94,7 @@
- typedef unsigned long long cUInt;
+@@ -81,7 +99,7 @@
+
#endif
-struct IntPoint {
@@ -72,7 +72,7 @@
cInt X;
cInt Y;
#ifdef use_xyz
-@@ -103,11 +121,11 @@
+@@ -108,11 +126,11 @@
inline Path& operator <<(Path& poly, const IntPoint& p) {poly.push_back(p); return poly;}
inline Paths& operator <<(Paths& polys, const Path& p) {polys.push_back(p); return polys;}
@@ -88,9 +88,9 @@
{
double X;
double Y;
-@@ -127,10 +145,10 @@
- enum EndType_ {etClosed, etButt = 2, etSquare, etRound};
- #endif
+@@ -129,10 +147,10 @@
+ enum JoinType {jtSquare, jtRound, jtMiter};
+ enum EndType {etClosedPolygon, etClosedLine, etOpenButt, etOpenSquare, etOpenRound};
-class PolyNode;
+class CLIPPER_EXPORT PolyNode;
@@ -101,7 +101,7 @@
{
public:
PolyNode();
-@@ -152,7 +170,7 @@
+@@ -155,7 +173,7 @@
friend class ClipperOffset;
};
@@ -110,23 +110,14 @@
{
public:
~PolyTree(){Clear();};
-@@ -164,49 +182,49 @@
+@@ -167,43 +185,43 @@
friend class Clipper; //to access AllNodes
};
-bool Orientation(const Path &poly);
-double Area(const Path &poly);
-int PointInPolygon(const IntPoint &pt, const Path &path);
-+CLIPPER_EXPORT bool Orientation(const Path &poly);
-+CLIPPER_EXPORT double Area(const Path &poly);
-+CLIPPER_EXPORT int PointInPolygon(const IntPoint &pt, const Path &path);
-
- #ifdef use_deprecated
-- void OffsetPaths(const Paths &in_polys, Paths &out_polys,
-+ CLIPPER_EXPORT void OffsetPaths(const Paths &in_polys, Paths &out_polys,
- double delta, JoinType jointype, EndType_ endtype, double limit = 0);
- #endif
-
+-
-void SimplifyPolygon(const Path &in_poly, Paths &out_polys, PolyFillType fillType = pftEvenOdd);
-void SimplifyPolygons(const Paths &in_polys, Paths &out_polys, PolyFillType fillType = pftEvenOdd);
-void SimplifyPolygons(Paths &polys, PolyFillType fillType = pftEvenOdd);
@@ -135,6 +126,18 @@
-void CleanPolygon(Path& poly, double distance = 1.415);
-void CleanPolygons(const Paths& in_polys, Paths& out_polys, double distance = 1.415);
-void CleanPolygons(Paths& polys, double distance = 1.415);
+-
+-void MinkowskiSum(const Path& pattern, const Path& path, Paths& solution, bool pathIsClosed);
+-void MinkowskiSum(const Path& pattern, const Paths& paths, Paths& solution, bool pathIsClosed);
+-void MinkowskiDiff(const Path& poly1, const Path& poly2, Paths& solution);
+-
+-void PolyTreeToPaths(const PolyTree& polytree, Paths& paths);
+-void ClosedPathsFromPolyTree(const PolyTree& polytree, Paths& paths);
+-void OpenPathsFromPolyTree(PolyTree& polytree, Paths& paths);
++CLIPPER_EXPORT bool Orientation(const Path &poly);
++CLIPPER_EXPORT double Area(const Path &poly);
++CLIPPER_EXPORT int PointInPolygon(const IntPoint &pt, const Path &path);
++
+CLIPPER_EXPORT void SimplifyPolygon(const Path &in_poly, Paths &out_polys, PolyFillType fillType = pftEvenOdd);
+CLIPPER_EXPORT void SimplifyPolygons(const Paths &in_polys, Paths &out_polys, PolyFillType fillType = pftEvenOdd);
+CLIPPER_EXPORT void SimplifyPolygons(Paths &polys, PolyFillType fillType = pftEvenOdd);
@@ -143,18 +146,11 @@
+CLIPPER_EXPORT void CleanPolygon(Path& poly, double distance = 1.415);
+CLIPPER_EXPORT void CleanPolygons(const Paths& in_polys, Paths& out_polys, double distance = 1.415);
+CLIPPER_EXPORT void CleanPolygons(Paths& polys, double distance = 1.415);
-
--void MinkowskiSum(const Path& pattern, const Path& path, Paths& solution, bool pathIsClosed);
--void MinkowskiSum(const Path& pattern, const Paths& paths,
++
+CLIPPER_EXPORT void MinkowskiSum(const Path& pattern, const Path& path, Paths& solution, bool pathIsClosed);
-+CLIPPER_EXPORT void MinkowskiSum(const Path& pattern, const Paths& paths,
- Paths& solution, PolyFillType pathFillType, bool pathIsClosed);
--void MinkowskiDiff(const Path& poly1, const Path& poly2, Paths& solution);
++CLIPPER_EXPORT void MinkowskiSum(const Path& pattern, const Paths& paths, Paths& solution, bool pathIsClosed);
+CLIPPER_EXPORT void MinkowskiDiff(const Path& poly1, const Path& poly2, Paths& solution);
-
--void PolyTreeToPaths(const PolyTree& polytree, Paths& paths);
--void ClosedPathsFromPolyTree(const PolyTree& polytree, Paths& paths);
--void OpenPathsFromPolyTree(PolyTree& polytree, Paths& paths);
++
+CLIPPER_EXPORT void PolyTreeToPaths(const PolyTree& polytree, Paths& paths);
+CLIPPER_EXPORT void ClosedPathsFromPolyTree(const PolyTree& polytree, Paths& paths);
+CLIPPER_EXPORT void OpenPathsFromPolyTree(PolyTree& polytree, Paths& paths);
@@ -173,14 +169,14 @@
//forward declarations (for stuff used internally) ...
-struct TEdge;
-struct IntersectNode;
--struct LocalMinima;
+-struct LocalMinimum;
-struct Scanbeam;
-struct OutPt;
-struct OutRec;
-struct Join;
+struct CLIPPER_EXPORT TEdge;
+struct CLIPPER_EXPORT IntersectNode;
-+struct CLIPPER_EXPORT LocalMinima;
++struct CLIPPER_EXPORT LocalMinimum;
+struct CLIPPER_EXPORT Scanbeam;
+struct CLIPPER_EXPORT OutPt;
+struct CLIPPER_EXPORT OutRec;
@@ -188,7 +184,7 @@
typedef std::vector < OutRec* > PolyOutList;
typedef std::vector < TEdge* > EdgeList;
-@@ -219,7 +237,7 @@
+@@ -215,7 +233,7 @@
//ClipperBase is the ancestor to the Clipper class. It should not be
//instantiated directly. This class simply abstracts the conversion of sets of
//polygon coordinates into edge objects that are stored in a LocalMinima list.
@@ -197,7 +193,7 @@
{
public:
ClipperBase();
-@@ -249,7 +267,7 @@
+@@ -247,7 +265,7 @@
};
//------------------------------------------------------------------------------
@@ -206,7 +202,7 @@
{
public:
Clipper(int initOptions = 0);
-@@ -349,7 +367,7 @@
+@@ -346,7 +364,7 @@
};
//------------------------------------------------------------------------------
@@ -215,7 +211,7 @@
{
public:
ClipperOffset(double miterLimit = 2.0, double roundPrecision = 0.25);
-@@ -380,7 +398,7 @@
+@@ -377,7 +395,7 @@
};
//------------------------------------------------------------------------------
@@ -224,5 +220,3 @@
{
public:
clipperException(const char* description): m_descr(description) {}
-
-
diff --git a/sources b/sources
index 5697b51..6a0ba6d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4dcd043ce48de59714f07bd3ec7ac62b clipper_ver6.1.3a.zip
+3ab1a1c3bbadadae48a36f59817b1183 clipper_ver6.2.0.zip
More information about the scm-commits
mailing list