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

* Fix issue ID #38900: union wrongly implemented

Browse Source 
git-svn-id: trunk@49376 -
This commit is contained in:
michael 2021-05-17 14:56:09 +00:00
parent 83253676a3
commit 59d4aaf5ec
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rtl/objpas/types.pp
View File

@ -686,6 +686,7 @@ begin
Result.x := apt.X; Result.x := apt.X;
Result.y := apt.Y; Result.y := apt.Y;
end; end;
{ TRectF } { TRectF }
function TRectF.GetHeight: Single; function TRectF.GetHeight: Single;
@ -712,8 +713,8 @@ function TRectF.Union(const r: TRectF): TRectF;
begin begin
result.left:=min(r.left,left); result.left:=min(r.left,left);
result.top:=min(r.top,top); result.top:=min(r.top,top);
result.right:=min(r.right,right); result.right:=max(r.right,right);
result.bottom:=min(r.bottom,bottom); result.bottom:=max(r.bottom,bottom);
end; end;
procedure TRectF.Offset(const dx, dy: Single); procedure TRectF.Offset(const dx, dy: Single);