Changeset 424 for trunk/Packages/Common/UMetaCanvas.pas

Timestamp:

Apr 25, 2022, 6:22:53 PM (2 years ago)

Author:

chronos

Message:

• Modified: Update Common package to version 0.10.
• Modified: fgl unit replaced by Generics.Collections.

File:

• trunk/Packages/Common/UMetaCanvas.pas (modified) (5 diffs)

trunk/Packages/Common/UMetaCanvas.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Graphics, Types, fgl;
+  Classes, SysUtils, Graphics, Types, Generics.Collections;
 
 type
@@ -17 +17 @@
   end;
 
-  TCanvasObjects = class(TFPGObjectList<TCanvasObject>)
+  TCanvasObjects = class(TObjectList<TCanvasObject>)
   end;
 
@@ -140 +140 @@
     procedure RoundRect(const Rect: TRect; RX,RY: Integer); overload;
     procedure TextOut(X,Y: Integer; const Text: String); override;
-    procedure Polygon(Points: PPoint; NumPts: Integer; Winding: boolean = False); override;
+    procedure Polygon(Points: PPoint; NumPts: Integer; Winding: Boolean = False); override;
     procedure Ellipse(x1, y1, x2, y2: Integer); override;
     procedure StretchDraw(const DestRect: TRect; SrcGraphic: TGraphic); override;
@@ -500 +500 @@
 end;
 
-procedure TMetaCanvas.Polygon(Points: PPoint; NumPts: Integer; Winding: boolean
+procedure TMetaCanvas.Polygon(Points: PPoint; NumPts: Integer; Winding: Boolean
   );
 var
@@ -506 +506 @@
   I: Integer;
 begin
+  APoints := nil;
   SetLength(APoints, NumPts);
   for I := 0 to High(APoints) do