paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-29 17:59:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

* patch by Make TPointF * TPointF a component-wise multiplication, resolves #40042

Browse Source 
(cherry picked from commit f1e391fb41)
This commit is contained in:
florian 2022-12-17 18:20:24 +01:00 committed by marcoonthegit
parent 298b488da2
commit 04c6cb5047
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rtl/objpas/types.pp
View File

@ -139,10 +139,11 @@ type
class operator + (const apt1, apt2 : TPointF): TPointF;
class operator - (const apt1, apt2 : TPointF): TPointF;
class operator - (const apt1 : TPointF): TPointF;
class operator * (const apt1, apt2: TPointF): Single; // scalar product
class operator * (const apt1, apt2: TPointF): TPointF;
class operator * (const apt1: TPointF; afactor: single): TPointF;
class operator * (afactor: single; const apt1: TPointF): TPointF;
class operator := (const apt: TPoint): TPointF;
class operator ** (const apt1, apt2: TPointF): Single; // scalar product
end;
{ TSizeF }
@ -723,9 +724,10 @@ begin
result:=NOT (SameValue(apt1.x,apt2.x) and Samevalue(apt1.y,apt2.y));
end;
class operator TPointF. * (const apt1, apt2: TPointF): Single;
class operator TPointF. * (const apt1, apt2: TPointF): TPointF;
begin
result:=apt1.x*apt2.x + apt1.y*apt2.y;
result.x:=apt1.x*apt2.x;
result.y:=apt1.y*apt2.y;
end;
class operator TPointF. * (afactor: single; const apt1: TPointF): TPointF;
@ -738,6 +740,11 @@ begin
result:=apt1.Scale(afactor);
end;
class operator TPointF. ** (const apt1, apt2: TPointF): Single;
begin
result:=apt1.x*apt2.x + apt1.y*apt2.y;
end;
class operator TPointF.+ (const apt1, apt2 : TPointF): TPointF;
begin
result.x:=apt1.x+apt2.x;