Changeset 545 for trunk/Packages

Timestamp:

Apr 17, 2024, 10:23:55 AM (7 months ago)

Author:

chronos

Message:

• Fixed: Incorrect range checking in scaled bitmap drawing method.

File:

• trunk/Packages/DpiControls/Dpi.Common.pas (modified) (2 diffs)

trunk/Packages/DpiControls/Dpi.Common.pas

@@ -76 +76 @@
   end;
 
+  if XSrc < 0 then begin
+    X := X - XSrc;
+    Width := Width - XSrc;
+    XSrc := 0;
+  end;
+  if YSrc < 0 then begin
+    Y := Y - YSrc;
+    Height := Height - YSrc;
+    YSrc := 0;
+  end;
+
   if X < 0 then begin
     Width := Width + X;
@@ -86 +97 @@
     Y := 0;
   end;
-  if (X + Width) > Dest.Width then begin
+  if (X + Width) >= Dest.Width then begin
     Width := Dest.Width - X;
   end;
-  if (Y + Height) > Dest.Height then begin
+  if (Y + Height) >= Dest.Height then begin
     Height := Dest.Height - Y;
+  end;
+  if (Width < 0) or (Height < 0) then begin
+    Result := True;
+    Exit;
   end;