Sfoglia il codice sorgente

compilation fix for FPC 3.3.1

Johann ELSASS 1 anno fa
parent
commit
7bd8bd1580

+ 1 - 1
lazpaint/tools/utoolbrush.pas

@@ -327,7 +327,7 @@ begin
     if not SubPixelAccuracy then
     if not SubPixelAccuracy then
       len := max(abs(v.x),abs(v.y))
       len := max(abs(v.x),abs(v.y))
     else
     else
-      len := sqrt(v*v);
+      len := sqrt(v**v);
     minLen := round(power(BrushInfo.Size/10,0.8));
     minLen := round(power(BrushInfo.Size/10,0.8));
     if minLen < 1 then minLen := 1;
     if minLen < 1 then minLen := 1;
     if minLen > 5 then minLen := 5;
     if minLen > 5 then minLen := 5;

+ 2 - 2
lazpaint/uimageview.pas

@@ -9,7 +9,7 @@ unit UImageView;
 interface
 interface
 
 
 uses
 uses
-  Classes, SysUtils, USelectionHighlight, BGRABitmap, BGRABitmapTypes,
+  Classes, SysUtils, USelectionHighlight, BGRABitmap, Types, BGRABitmapTypes,
   LazPaintType, UImage, UZoom, Graphics, Controls, LCLType, UImageObservation,
   LazPaintType, UImage, UZoom, Graphics, Controls, LCLType, UImageObservation,
   laztablet, LMessages;
   laztablet, LMessages;
 
 
@@ -145,7 +145,7 @@ type
 
 
 implementation
 implementation
 
 
-uses BGRATransform, LCLIntf, Types, ugraph, math, UTool, BGRAThumbnail, LCScaleDPI, Forms,
+uses BGRATransform, LCLIntf, ugraph, math, UTool, BGRAThumbnail, LCScaleDPI, Forms,
   UToolVectorial, ExtCtrls;
   UToolVectorial, ExtCtrls;
 
 
 procedure InvalidateControlRect(AControl: TControl; AArea: TRect);
 procedure InvalidateControlRect(AControl: TControl; AArea: TRect);

+ 2 - 2
lazpaintcontrols/lcvectorpolyshapes.pas

@@ -815,11 +815,11 @@ begin
     if segmentLen > 0 then
     if segmentLen > 0 then
     begin
     begin
       u *= 1/segmentLen;
       u *= 1/segmentLen;
-      segmentPos := (FMousePos-Points[i])*u;
+      segmentPos := (FMousePos-Points[i])**u;
       if (segmentPos > 0) and (segmentPos< segmentLen) then
       if (segmentPos > 0) and (segmentPos< segmentLen) then
       begin
       begin
         n := PointF(u.y,-u.x);
         n := PointF(u.y,-u.x);
-        segmentDist := abs((FMousePos-Points[i])*n);
+        segmentDist := abs((FMousePos-Points[i])**n);
         if segmentDist <= bestSegmentDist then
         if segmentDist <= bestSegmentDist then
         begin
         begin
           bestSegmentDist := segmentDist;
           bestSegmentDist := segmentDist;

+ 2 - 2
lazpaintcontrols/lcvectorrectshapes.pas

@@ -489,7 +489,7 @@ begin
     FOrigin := FOriginBackup;
     FOrigin := FOriginBackup;
   end else
   end else
   begin
   begin
-    newSize := AFactor*FXUnitBackup*(ANewCoord-FOriginBackup);
+    newSize := AFactor*FXUnitBackup**(ANewCoord-FOriginBackup);
     if ssShift in AShift then
     if ssShift in AShift then
     begin
     begin
       FXAxis := FOriginBackup+FXUnitBackup*newSize;
       FXAxis := FOriginBackup+FXUnitBackup*newSize;
@@ -528,7 +528,7 @@ begin
     FOrigin := FOriginBackup;
     FOrigin := FOriginBackup;
   end else
   end else
   begin
   begin
-    newSizeY := AFactor*FYUnitBackup*(ANewCoord-FOriginBackup);
+    newSizeY := AFactor*FYUnitBackup**(ANewCoord-FOriginBackup);
     if ssShift in AShift then
     if ssShift in AShift then
     begin
     begin
       FYAxis := FOriginBackup+FYUnitBackup*newSizeY;
       FYAxis := FOriginBackup+FYUnitBackup*newSizeY;