compilation fix for FPC 3.3.1

bgrabitmap · Jan 22, 2024 · 7bd8bd1 · 7bd8bd1
1 parent fe54c2e
commit 7bd8bd1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/lazpaint/tools/utoolbrush.pas b/lazpaint/tools/utoolbrush.pas
@@ -327,7 +327,7 @@ function TToolGenericBrush.ContinueDrawing(toolDest: TBGRABitmap; originF,
     if not SubPixelAccuracy then
       len := max(abs(v.x),abs(v.y))
     else
-      len := sqrt(v*v);
+      len := sqrt(v**v);
     minLen := round(power(BrushInfo.Size/10,0.8));
     if minLen < 1 then minLen := 1;
     if minLen > 5 then minLen := 5;

diff --git a/lazpaint/uimageview.pas b/lazpaint/uimageview.pas
@@ -9,7 +9,7 @@
 interface
 
 uses
-  Classes, SysUtils, USelectionHighlight, BGRABitmap, BGRABitmapTypes,
+  Classes, SysUtils, USelectionHighlight, BGRABitmap, Types, BGRABitmapTypes,
   LazPaintType, UImage, UZoom, Graphics, Controls, LCLType, UImageObservation,
   laztablet, LMessages;
 
@@ -145,7 +145,7 @@   TImageView = class
 
 implementation
 
-uses BGRATransform, LCLIntf, Types, ugraph, math, UTool, BGRAThumbnail, LCScaleDPI, Forms,
+uses BGRATransform, LCLIntf, ugraph, math, UTool, BGRAThumbnail, LCScaleDPI, Forms,
   UToolVectorial, ExtCtrls;
 
 procedure InvalidateControlRect(AControl: TControl; AArea: TRect);

diff --git a/lazpaintcontrols/lcvectorpolyshapes.pas b/lazpaintcontrols/lcvectorpolyshapes.pas
@@ -815,11 +815,11 @@ procedure TCustomPolypointShape.InsertPointAuto(AShift: TShiftState);
     if segmentLen > 0 then
     begin
       u *= 1/segmentLen;
-      segmentPos := (FMousePos-Points[i])*u;
+      segmentPos := (FMousePos-Points[i])**u;
       if (segmentPos > 0) and (segmentPos< segmentLen) then
       begin
         n := PointF(u.y,-u.x);
-        segmentDist := abs((FMousePos-Points[i])*n);
+        segmentDist := abs((FMousePos-Points[i])**n);
         if segmentDist <= bestSegmentDist then
         begin
           bestSegmentDist := segmentDist;

diff --git a/lazpaintcontrols/lcvectorrectshapes.pas b/lazpaintcontrols/lcvectorrectshapes.pas
@@ -489,7 +489,7 @@ procedure TCustomRectShape.DoMoveXAxis(ANewCoord: TPointF; AShift: TShiftState;
     FOrigin := FOriginBackup;
   end else
   begin
-    newSize := AFactor*FXUnitBackup*(ANewCoord-FOriginBackup);
+    newSize := AFactor*FXUnitBackup**(ANewCoord-FOriginBackup);
     if ssShift in AShift then
     begin
       FXAxis := FOriginBackup+FXUnitBackup*newSize;
@@ -528,7 +528,7 @@ procedure TCustomRectShape.DoMoveYAxis(ANewCoord: TPointF; AShift: TShiftState;
     FOrigin := FOriginBackup;
   end else
   begin
-    newSizeY := AFactor*FYUnitBackup*(ANewCoord-FOriginBackup);
+    newSizeY := AFactor*FYUnitBackup**(ANewCoord-FOriginBackup);
     if ssShift in AShift then
     begin
       FYAxis := FOriginBackup+FYUnitBackup*newSizeY;