From cd7134e6f66fb7d999394f14edc21557d97f0cb4 Mon Sep 17 00:00:00 2001 From: bubnikv Date: Thu, 2 Mar 2017 20:44:28 +0100 Subject: [PATCH] Revert "Fix: Orientation() has been declared inline, therefore not exported." This reverts commit c2ee73d21115b2077a0e7ed2d6f9b31f995b1b9e. --- xs/src/clipper.cpp | 6 ++++++ xs/src/clipper.hpp | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/xs/src/clipper.cpp b/xs/src/clipper.cpp index 7ead760bf..1eac45a70 100644 --- a/xs/src/clipper.cpp +++ b/xs/src/clipper.cpp @@ -285,6 +285,12 @@ inline Int128 Int128Mul (long64 lhs, long64 rhs) // Miscellaneous global functions //------------------------------------------------------------------------------ +inline bool Orientation(const Path &poly) +{ + return Area(poly) >= 0; +} +//------------------------------------------------------------------------------ + double Area(const Path &poly) { int size = (int)poly.size(); diff --git a/xs/src/clipper.hpp b/xs/src/clipper.hpp index e62e27e89..11626e396 100644 --- a/xs/src/clipper.hpp +++ b/xs/src/clipper.hpp @@ -186,8 +186,8 @@ private: friend class Clipper; //to access AllNodes }; +bool Orientation(const Path &poly); double Area(const Path &poly); -inline bool Orientation(const Path &poly) { return Area(poly) >= 0; } int PointInPolygon(const IntPoint &pt, const Path &path); void SimplifyPolygon(const Path &in_poly, Paths &out_polys, PolyFillType fillType = pftEvenOdd);