diff --git a/CPP/CMakeLists.txt b/CPP/CMakeLists.txt index 2a85bf96..6f74f7ea 100644 --- a/CPP/CMakeLists.txt +++ b/CPP/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.15) -project(Clipper2 VERSION 1.1.1 LANGUAGES C CXX) +project(Clipper2 VERSION 1.2.0 LANGUAGES C CXX) set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_CXX_STANDARD 17) diff --git a/CPP/Clipper2Lib/include/clipper2/clipper.engine.h b/CPP/Clipper2Lib/include/clipper2/clipper.engine.h index 2e5841b7..cfa1456d 100644 --- a/CPP/Clipper2Lib/include/clipper2/clipper.engine.h +++ b/CPP/Clipper2Lib/include/clipper2/clipper.engine.h @@ -1,6 +1,6 @@ /******************************************************************************* * Author : Angus Johnson * -* Date : 28 January 2023 * +* Date : 26 February 2023 * * Website : http://www.angusj.com * * Copyright : Angus Johnson 2010-2023 * * Purpose : This is the main polygon clipping module * @@ -10,7 +10,7 @@ #ifndef CLIPPER_ENGINE_H #define CLIPPER_ENGINE_H -constexpr auto CLIPPER2_VERSION = "1.1.1"; +constexpr auto CLIPPER2_VERSION = "1.2.0"; #include #include diff --git a/DLL/Delphi_TestApp/Clipper.SVG.pas b/DLL/Delphi_TestApp/Clipper.SVG.pas index 4012506d..bf2008bb 100644 --- a/DLL/Delphi_TestApp/Clipper.SVG.pas +++ b/DLL/Delphi_TestApp/Clipper.SVG.pas @@ -98,7 +98,10 @@ TSvgWriter = class procedure AddPath(const path: TPath64; isOpen: Boolean; brushColor, penColor: Cardinal; - penWidth: double; showCoords: Boolean = false); + penWidth: double; showCoords: Boolean = false); overload; + procedure AddPath(const path: TPathD; isOpen: Boolean; + brushColor, penColor: Cardinal; + penWidth: double; showCoords: Boolean = false); overload; procedure AddPaths(const paths: TPaths64; isOpen: Boolean; brushColor, penColor: Cardinal; @@ -219,6 +222,13 @@ procedure TSvgWriter.AddPath(const path: TPath64; isOpen: Boolean; AddPaths(Paths64(path), isOpen, brushColor, penColor, penWidth, showCoords); end; +procedure TSvgWriter.AddPath(const path: TPathD; isOpen: Boolean; + brushColor, penColor: Cardinal; + penWidth: double; showCoords: Boolean); +begin + AddPaths(PathsD(path), isOpen, brushColor, penColor, penWidth, showCoords); +end; + procedure TSvgWriter.AddPaths(const paths: TPaths64; isOpen: Boolean; brushColor, penColor: Cardinal; penWidth: double; showCoords: Boolean = false); diff --git a/DLL/Delphi_TestApp/Test_DLL.dpr b/DLL/Delphi_TestApp/Test_DLL.dpr index e8dc9105..c0a89cc3 100644 --- a/DLL/Delphi_TestApp/Test_DLL.dpr +++ b/DLL/Delphi_TestApp/Test_DLL.dpr @@ -854,7 +854,6 @@ var sub, clp, sol1, sol2: TPathsD; csub_local: CPathsD; csol_extern: CPathsD; - penClr, fillClr: TColor32; scaleRnd, maxOffX, maxOffY, frac: Double; rec: TRectD; fillrule: TFillRule; @@ -920,9 +919,6 @@ begin frac := 0 else frac := 1/sol2_len; - penClr := RainbowColor(frac, 92); - fillClr := (penClr and $FFFFFF) or $20000000; - SetLength(clp, 1); clp[0] := rec.AsPath; diff --git a/DLL/Delphi_TestApp/Test_DLL.dproj b/DLL/Delphi_TestApp/Test_DLL.dproj index d36d3499..daf79e04 100644 --- a/DLL/Delphi_TestApp/Test_DLL.dproj +++ b/DLL/Delphi_TestApp/Test_DLL.dproj @@ -64,6 +64,8 @@ MainSource + + Cfg_2 Base