Skip to content

Commit fecaa16

Browse files
committed
Release version 1.2.0
1 parent df1c129 commit fecaa16

File tree

5 files changed

+16
-8
lines changed

5 files changed

+16
-8
lines changed

CPP/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.15)
2-
project(Clipper2 VERSION 1.1.1 LANGUAGES C CXX)
2+
project(Clipper2 VERSION 1.2.0 LANGUAGES C CXX)
33

44
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
55
set(CMAKE_CXX_STANDARD 17)

CPP/Clipper2Lib/include/clipper2/clipper.engine.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*******************************************************************************
22
* Author : Angus Johnson *
3-
* Date : 28 January 2023 *
3+
* Date : 26 February 2023 *
44
* Website : http://www.angusj.com *
55
* Copyright : Angus Johnson 2010-2023 *
66
* Purpose : This is the main polygon clipping module *
@@ -10,7 +10,7 @@
1010
#ifndef CLIPPER_ENGINE_H
1111
#define CLIPPER_ENGINE_H
1212

13-
constexpr auto CLIPPER2_VERSION = "1.1.1";
13+
constexpr auto CLIPPER2_VERSION = "1.2.0";
1414

1515
#include <cstdlib>
1616
#include <iostream>

DLL/Delphi_TestApp/Clipper.SVG.pas

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,10 @@ TSvgWriter = class
9898

9999
procedure AddPath(const path: TPath64; isOpen: Boolean;
100100
brushColor, penColor: Cardinal;
101-
penWidth: double; showCoords: Boolean = false);
101+
penWidth: double; showCoords: Boolean = false); overload;
102+
procedure AddPath(const path: TPathD; isOpen: Boolean;
103+
brushColor, penColor: Cardinal;
104+
penWidth: double; showCoords: Boolean = false); overload;
102105

103106
procedure AddPaths(const paths: TPaths64; isOpen: Boolean;
104107
brushColor, penColor: Cardinal;
@@ -219,6 +222,13 @@ procedure TSvgWriter.AddPath(const path: TPath64; isOpen: Boolean;
219222
AddPaths(Paths64(path), isOpen, brushColor, penColor, penWidth, showCoords);
220223
end;
221224

225+
procedure TSvgWriter.AddPath(const path: TPathD; isOpen: Boolean;
226+
brushColor, penColor: Cardinal;
227+
penWidth: double; showCoords: Boolean);
228+
begin
229+
AddPaths(PathsD(path), isOpen, brushColor, penColor, penWidth, showCoords);
230+
end;
231+
222232
procedure TSvgWriter.AddPaths(const paths: TPaths64;
223233
isOpen: Boolean; brushColor, penColor: Cardinal;
224234
penWidth: double; showCoords: Boolean = false);

DLL/Delphi_TestApp/Test_DLL.dpr

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -854,7 +854,6 @@ var
854854
sub, clp, sol1, sol2: TPathsD;
855855
csub_local: CPathsD;
856856
csol_extern: CPathsD;
857-
penClr, fillClr: TColor32;
858857
scaleRnd, maxOffX, maxOffY, frac: Double;
859858
rec: TRectD;
860859
fillrule: TFillRule;
@@ -920,9 +919,6 @@ begin
920919
frac := 0 else
921920
frac := 1/sol2_len;
922921

923-
penClr := RainbowColor(frac, 92);
924-
fillClr := (penClr and $FFFFFF) or $20000000;
925-
926922
SetLength(clp, 1);
927923
clp[0] := rec.AsPath;
928924

DLL/Delphi_TestApp/Test_DLL.dproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@
6464
<MainSource>MainSource</MainSource>
6565
</DelphiCompile>
6666
<DCCReference Include="SvgWriter.pas"/>
67+
<DCCReference Include="Colors.pas"/>
68+
<DCCReference Include="Timer.pas"/>
6769
<BuildConfiguration Include="Debug">
6870
<Key>Cfg_2</Key>
6971
<CfgParent>Base</CfgParent>

0 commit comments

Comments
 (0)