Changeset 480 for trunk

Timestamp:

Dec 6, 2023, 11:05:10 PM (5 months ago)

Author:

chronos

Message:

• Fixed: Bitmap processing out of range error.

Location:

trunk/LocalPlayer

Files:

• MessgEx.pas (modified) (1 diff)
• Term.pas (modified) (2 diffs)

trunk/LocalPlayer/MessgEx.pas

@@ -264 +264 @@
             else
               share := share * yR;
-            Screwed[xDst + dx, yDst + dy, 0] := Screwed[xDst + dx, yDst + dy, 0]
-              + share * SrcPtr.Pixel^.B;
-            Screwed[xDst + dx, yDst + dy, 1] := Screwed[xDst + dx, yDst + dy, 1]
-              + share * SrcPtr.Pixel^.G;
-            Screwed[xDst + dx, yDst + dy, 2] := Screwed[xDst + dx, yDst + dy, 2]
-              + share * SrcPtr.Pixel^.R;
-            Screwed[xDst + dx, yDst + dy, 3] := Screwed[xDst + dx, yDst + dy,
-              3] + share;
+            if (xDst + dx < ScaleToNative(Width)) and
+            (yDst + dy < ScaleToNative(Height)) then begin
+              Screwed[xDst + dx, yDst + dy, 0] := Screwed[xDst + dx, yDst + dy, 0]
+                + share * SrcPtr.Pixel^.B;
+              Screwed[xDst + dx, yDst + dy, 1] := Screwed[xDst + dx, yDst + dy, 1]
+                + share * SrcPtr.Pixel^.G;
+              Screwed[xDst + dx, yDst + dy, 2] := Screwed[xDst + dx, yDst + dy, 2]
+                + share * SrcPtr.Pixel^.R;
+              Screwed[xDst + dx, yDst + dy, 3] := Screwed[xDst + dx, yDst + dy,
+                3] + share;
+            end;
         end;
         SrcPtr.NextPixel;

trunk/LocalPlayer/Term.pas

@@ -719 +719 @@
   TBuffer = array [0 .. 99999, 0 .. 2] of Integer;
 var
-  Sum, Cnt, dx, dy, nx, ny, ix, iy, ir, X, Y, C, ch: Integer;
+  Sum: Int64;
+  Cnt, dx, dy, nx, ny, ix, iy, ir, X, Y, C, ch: Integer;
   xdivider, ydivider: Integer;
   Resampled: ^TBuffer;
   PixelPtr: TPixelPointer;
+  V: Integer;
 begin
   nx := BigImp.Width div xSizeBig * xSizeSmall;
@@ -784 +786 @@
                 ((dx <= 0) or (ScaleFromNative(X) mod xSizeSmall < xSizeSmall - 1)) then
               begin
-                Inc(Sum, Resampled[ScaleFromNative(X) + dx + nx * (ScaleFromNative(Y) + dy), ch]);
+                V := Resampled[ScaleFromNative(X) + dx + nx * (ScaleFromNative(Y) + dy), ch];
+                Inc(Sum, V);
                 Inc(Cnt);
               end;
-        Sum := ((Cnt * Sharpen + 800) * Resampled[ScaleFromNative(X) + nx * ScaleFromNative(Y), ch] - Sum *
-          Sharpen) div (800 * xSizeBig * (ySizeBig - 2 * Cut));
+        V := Resampled[ScaleFromNative(X) + nx * ScaleFromNative(Y), ch];
+        Sum := ((Cnt * Sharpen + 800) * V - Sum * Sharpen)
+          div (800 * xSizeBig * (ySizeBig - 2 * Cut));
+        Sum := Round(Sum / ScaleToNative(ScaleToNative(1)));
         if Sum < 0 then Sum := 0;
         if Sum > 255 then Sum := 255;