ver. 3.3.0

- Added "Wordwrap option" for the editor (active by default)
- Updated the latest Image32 library
- Added Color options in Viewer GUI (Grayscale, FixedColor, ApplyFixedColorToRootOnly)
- Added Color options in Editor GUI
- Updated to Image32 4.6 Released Feb 2025 to fix some drawing issue

Author: carloBarazzetta

Debug/Preview Handlers/PreviewHandler Host/PreviewHost.dproj

@@ -1,14 +1,15 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{4BBCE26D-2844-4147-BD21-3D736FC10602}</ProjectGuid>
-        <ProjectVersion>19.5</ProjectVersion>
+        <ProjectVersion>20.2</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <MainSource>PreviewHost.dpr</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Application</AppType>
+        <ProjectName Condition="'$(ProjectName)'==''">PreviewHost</ProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>

Debug/Preview Handlers/PreviewHandler Host/PreviewHost.res

@@ -2,12 +2,12 @@
 
 (*******************************************************************************
 * Author    :  Angus Johnson                                                   *
-* Date      :  12 August 2024                                                  *
-* Website   :  http://www.angusj.com                                           *
+* Date      :  22 November 2024                                                *
+* Website   :  https://www.angusj.com                                          *
 * Copyright :  Angus Johnson 2010-2024                                         *
 * Purpose   :  Core Clipper Library module                                     *
 *              Contains structures and functions used throughout the library   *
-* License   :  http://www.boost.org/LICENSE_1_0.txt                            *
+* License   :  https://www.boost.org/LICENSE_1_0.txt                           *
 *******************************************************************************)
 
 {$I Clipper.inc}
@@ -19,23 +19,22 @@ interface
 
 type
 {$IFDEF USINGZ}
-    Ztype   = type double;//Int64;//
-    PZtype  = ^Ztype;
+    ZType = Int64; // or alternatively, ZType = double
 {$ENDIF}
 
   PPoint64  = ^TPoint64;
   TPoint64  = record
     X, Y: Int64;
 {$IFDEF USINGZ}
-    Z: Ztype;
+    Z: ZType;
 {$ENDIF}
   end;
 
   PPointD   = ^TPointD;
   TPointD   = record
     X, Y: double;
 {$IFDEF USINGZ}
-    Z: Ztype;
+    Z: ZType;
 {$ENDIF}
   end;
 
@@ -125,6 +124,7 @@   TListEx = class
     fCount    : integer;
     fCapacity : integer;
     fList     : TPointerList;
+    fSorted   : Boolean;
   protected
     function UnsafeGet(idx: integer): Pointer; // no range checking
     procedure UnsafeSet(idx: integer; val: Pointer);
@@ -134,14 +134,16 @@   TListEx = class
     destructor Destroy; override;
     procedure Clear; virtual;
     function Add(item: Pointer): integer;
+    procedure DeleteLast;
     procedure Swap(idx1, idx2: integer);
-    procedure Sort(Compare: TListSortCompare);
+    procedure Sort(Compare: TListSortCompareFunc);
     procedure Resize(count: integer);
     property Count: integer read fCount;
+    property Sorted: Boolean read fSorted;
     property Item[idx: integer]: Pointer read UnsafeGet; default;
   end;
 
-  TClipType = (ctNone, ctIntersection, ctUnion, ctDifference, ctXor);
+  TClipType = (ctNoClip, ctIntersection, ctUnion, ctDifference, ctXor);
 
   TPointInPolygonResult = (pipOn, pipInside, pipOutside);
 
@@ -544,6 +546,7 @@ procedure TListEx.Clear;
   fList := nil;
   fCount := 0;
   fCapacity := 0;
+  fSorted := false;
 end;
 //------------------------------------------------------------------------------
 
@@ -559,6 +562,13 @@ function TListEx.Add(item: Pointer): integer;
   fList[fCount] := item;
   Result := fCount;
   inc(fCount);
+  fSorted := false;
+end;
+//------------------------------------------------------------------------------
+
+procedure TListEx.DeleteLast;
+begin
+  dec(fCount);
 end;
 //------------------------------------------------------------------------------
 
@@ -615,10 +625,11 @@ procedure QuickSort(SortList: TPointerList; L, R: Integer;
 end;
 //------------------------------------------------------------------------------
 
-procedure TListEx.Sort(Compare: TListSortCompare);
+procedure TListEx.Sort(Compare: TListSortCompareFunc);
 begin
   if fCount < 2 then Exit;
   QuickSort(FList, 0, fCount - 1, Compare);
+  fSorted := true;
 end;
 //------------------------------------------------------------------------------
 
@@ -658,6 +669,7 @@ procedure TListEx.Swap(idx1, idx2: integer);
   p := fList[idx1];
   fList[idx1] := fList[idx2];
   fList[idx2] := p;
+  fSorted := false;
 end;
 
 //------------------------------------------------------------------------------

Ext/SVGIconImageList/Image32/source/Clipper.Core.pas

@@ -2,11 +2,11 @@
 
 (*******************************************************************************
 * Author    :  Angus Johnson                                                   *
-* Date      :  12 August 2024                                                  *
-* Website   :  http://www.angusj.com                                           *
+* Date      :  22 November 2024                                                *
+* Website   :  https://www.angusj.com                                          *
 * Copyright :  Angus Johnson 2010-2024                                         *
 * Purpose   :  This is the main polygon clipping module                        *
-* License   :  http://www.boost.org/LICENSE_1_0.txt                            *
+* License   :  https://www.boost.org/LICENSE_1_0.txt                           *
 *******************************************************************************)
 
 interface
@@ -899,7 +899,7 @@ function PointInOpPolygon(const pt: TPoint64; op: POutPt): TPointInPolygonResult
       while (op2 <> op) and (op2.pt.Y > pt.Y) do op2 := op2.next;
     if (op2 = op) then break;
 
-    // must have touched or crossed the pt.Y horizonal
+    // must have touched or crossed the pt.Y horizontal
     // and this must happen an even number of times
 
     if (op2.pt.Y = pt.Y) then // touching the horizontal
@@ -2690,7 +2690,7 @@ procedure TClipperBase.IntersectEdges(e1, e2: PActive; pt: TPoint64);
     end else if IsFront(e1) or (e1.outrec = e2.outrec) then
     begin
       // this 'else if' condition isn't strictly needed but
-      // it's sensible to split polygons that ony touch at
+      // it's sensible to split polygons that only touch at
       // a common vertex (not at common edges).
       op := AddLocalMaxPoly(e1, e2, pt);
       {$IFDEF USINGZ}
@@ -2845,7 +2845,7 @@ procedure TClipperBase.ExecuteInternal(clipType: TClipType;
   Y: Int64;
   e: PActive;
 begin
-  if clipType = ctNone then Exit;
+  if clipType = ctNoClip then Exit;
   FFillRule := fillRule;
   FClipType := clipType;
   Reset;
@@ -3528,7 +3528,7 @@ procedure TClipperBase.DoHorizontal(horzEdge: PActive);
       end;
       if IsHotEdge(horzEdge) then
       begin
-        //nb: The outrec containining the op returned by IntersectEdges
+        //nb: The outrec containing the op returned by IntersectEdges
         //above may no longer be associated with horzEdge.
         FHorzSegList.Add(GetLastOp(horzEdge));
       end;

Ext/SVGIconImageList/Image32/source/Clipper.Engine.pas

@@ -5,7 +5,7 @@
 * Date      :  21 December 2023                                                *
 * Copyright :  Angus Johnson 2010-2022                                         *
 * Purpose   :  Minkowski Addition and Difference                               *
-* License   :  http://www.boost.org/LICENSE_1_0.txt                            *
+* License   :  https://www.boost.org/LICENSE_1_0.txt                           *
 *******************************************************************************)
 
 {$I Clipper.inc}

Ext/SVGIconImageList/Image32/source/Clipper.Minkowski.pas

@@ -2,11 +2,11 @@
 
 (*******************************************************************************
 * Author    :  Angus Johnson                                                   *
-* Date      :  12 August 2024                                                  *
-* Website   :  http://www.angusj.com                                           *
-* Copyright :  Angus Johnson 2010-2024                                         *
+* Date      :  22 January 2025                                                 *
+* Website   :  https://www.angusj.com                                          *
+* Copyright :  Angus Johnson 2010-2025                                         *
 * Purpose   :  Path Offset (Inflate/Shrink)                                    *
-* License   :  http://www.boost.org/LICENSE_1_0.txt                            *
+* License   :  https://www.boost.org/LICENSE_1_0.txt                           *
 *******************************************************************************)
 
 {$I Clipper.inc}
@@ -142,6 +142,20 @@ implementation
   TwoPi     : Double = 2 * PI;
   InvTwoPi  : Double = 1/(2 * PI);
 
+// Clipper2 approximates arcs by using series of relatively short straight
+//line segments. And logically, shorter line segments will produce better arc
+// approximations. But very short segments can degrade performance, usually
+// with little or no discernable improvement in curve quality. Very short
+// segments can even detract from curve quality, due to the effects of integer
+// rounding. Since there isn't an optimal number of line segments for any given
+// arc radius (that perfectly balances curve approximation with performance),
+// arc tolerance is user defined. Nevertheless, when the user doesn't define
+// an arc tolerance (ie leaves alone the 0 default value), the calculated
+// default arc tolerance (offset_radius / 500) generally produces good (smooth)
+// arc approximations without producing excessively small segment lengths.
+// See also: https://www.angusj.com/clipper2/Docs/Trigonometry.htm
+const arc_const = 0.002; // <-- 1/500
+
 //------------------------------------------------------------------------------
 //  Miscellaneous offset support functions
 //------------------------------------------------------------------------------
@@ -364,13 +378,12 @@ procedure TClipperOffset.DoGroupOffset(group: TGroup);
   if (group.joinType = jtRound) or (group.endType = etRound) then
   begin
 		// calculate the number of steps required to approximate a circle
-    // (see http://www.angusj.com/clipper2/Docs/Trigonometry.htm)
+    // (see https://www.angusj.com/clipper2/Docs/Trigonometry.htm)
 		// arcTol - when arc_tolerance_ is undefined (0) then curve imprecision
     // will be relative to the size of the offset (delta). Obviously very
     //large offsets will almost always require much less precision.
-    arcTol := Iif(fArcTolerance > 0.01,
-      Min(absDelta, fArcTolerance),
-      Log10(2 + absDelta) * 0.25); // empirically derived
+    arcTol := Iif(fArcTolerance > 0.0,
+      Min(absDelta, fArcTolerance), absDelta * arc_const);
 
     stepsPer360 := Pi / ArcCos(1 - arcTol / absDelta);
 		if (stepsPer360 > absDelta * Pi) then
@@ -745,7 +758,7 @@ function IntersectPoint(const ln1a, ln1b, ln2a, ln2b: TPointD): TPointD;
   m1,b1,m2,b2: double;
 begin
   result := NullPointD;
-  //see http://astronomy.swin.edu.au/~pbourke/geometry/lineline2d/
+  //see https://paulbourke.net/geometry/pointlineplane/#i2l
   if (ln1B.X = ln1A.X) then
   begin
     if (ln2B.X = ln2A.X) then exit; //parallel lines
@@ -917,10 +930,8 @@ procedure TClipperOffset.DoRound(j, k: Integer; angle: double);
     // when fDeltaCallback64 is assigned, fGroupDelta won't be constant,
     // so we'll need to do the following calculations for *every* vertex.
     absDelta := Abs(fGroupDelta);
-    arcTol := Iif(fArcTolerance > 0.01,
-      Min(absDelta, fArcTolerance),
-      Log10(2 + absDelta) * 0.25); // empirically derived
-    //http://www.angusj.com/clipper2/Docs/Trigonometry.htm
+    arcTol := Iif(fArcTolerance > 0.0,
+      Min(absDelta, fArcTolerance), absDelta * arc_const);
     stepsPer360 := Pi / ArcCos(1 - arcTol / absDelta);
 		if (stepsPer360 > absDelta * Pi) then
 			stepsPer360 := absDelta * Pi;  // avoid excessive precision
@@ -997,15 +1008,11 @@ procedure TClipperOffset.DoRound(j, k: Integer; angle: double);
     // (ie over-shrunk paths) are removed.
 {$IFDEF USINGZ}
     AddPoint(GetPerpendic(fInPath[j], fNorms[k], fGroupDelta), fInPath[j].Z);
-{$ELSE}
-    AddPoint(GetPerpendic(fInPath[j], fNorms[k], fGroupDelta));
-{$ENDIF}
-    // when the angle is almost flat (cos_a ~= 1),
-    // it's safe to skip inserting this middle point
-		if (cosA < 0.999) then AddPoint(fInPath[j]); // (#405, #873)
-{$IFDEF USINGZ}
+    AddPoint(fInPath[j]); // (#405, #873)
     AddPoint(GetPerpendic(fInPath[j], fNorms[j], fGroupDelta), fInPath[j].Z);
 {$ELSE}
+    AddPoint(GetPerpendic(fInPath[j], fNorms[k], fGroupDelta));
+    AddPoint(fInPath[j]); // (#405, #873)
     AddPoint(GetPerpendic(fInPath[j], fNorms[j], fGroupDelta));
 {$ENDIF}
   end

Ext/SVGIconImageList/Image32/source/Clipper.Offset.pas

@@ -3,10 +3,10 @@
 (*******************************************************************************
 * Author    :  Angus Johnson                                                   *
 * Date      :  5 July 2024                                                     *
-* Website   :  http://www.angusj.com                                           *
+* Website   :  https://www.angusj.com                                          *
 * Copyright :  Angus Johnson 2010-2024                                         *
 * Purpose   :  FAST rectangular clipping                                       *
-* License   :  http://www.boost.org/LICENSE_1_0.txt                            *
+* License   :  https://www.boost.org/LICENSE_1_0.txt                           *
 *******************************************************************************)
 
 interface

Ext/SVGIconImageList/Image32/source/Clipper.RectClip.pas

@@ -7,7 +7,7 @@
 {.$DEFINE USINGZ}
 
 ///////////////////////////////////////////////////////////////////////////////
-//COMPILER DIFINED PREPROCESSOR DIRECTIVES (ie. do not touch ;))
+//COMPILER DEFINED PREPROCESSOR DIRECTIVES (ie. do not touch ;))
 ///////////////////////////////////////////////////////////////////////////////
 
 {$IFDEF FPC}

Ext/SVGIconImageList/Image32/source/Clipper.inc

@@ -3,10 +3,10 @@
 (*******************************************************************************
 * Author    :  Angus Johnson                                                   *
 * Date      :  7 May 2024                                                      *
-* Website   :  http://www.angusj.com                                           *
+* Website   :  https://www.angusj.com                                          *
 * Copyright :  Angus Johnson 2010-2024                                         *
 * Purpose   :  This module provides a simple interface to the Clipper Library  *
-* License   :  http://www.boost.org/LICENSE_1_0.txt                            *
+* License   :  https://www.boost.org/LICENSE_1_0.txt                           *
 *******************************************************************************)
 
 interface
@@ -52,7 +52,7 @@ interface
   etSquare    = Clipper.Offset.etSquare;
   etRound     = Clipper.Offset.etRound;
 
-  ctNone          = Clipper.Core.ctNone;
+  ctNone          = Clipper.Core.ctNoClip;
   ctIntersection  = Clipper.Core.ctIntersection;
   ctUnion         = Clipper.Core.ctUnion;
   ctDifference    = Clipper.Core.ctDifference;
@@ -821,7 +821,7 @@ function DistanceSqrd(const pt1, pt2: TPoint64): double;
 var
   x1,y1,x2,y2: double;
 begin
-  // nb: older versions of Delphi don't allow explicit typcasting
+  // nb: older versions of Delphi don't allow explicit typecasting
   x1 := pt1.X; y1 := pt1.Y;
   x2 := pt2.X; y2 := pt2.Y;
   result := Sqr(x1 - x2) + Sqr(y1 - y2);