Changeset 506 for trunk/MiniMap.pas

Timestamp:

Dec 25, 2023, 11:35:51 AM (5 months ago)

Author:

chronos

Message:

• Fixed: Better PixelPointer range checking.

File:

• trunk/MiniMap.pas (modified) (5 diffs)

trunk/MiniMap.pas

@@ -188 +188 @@
         if (PByte(MiniPixel.Pixel) >= Bitmap.RawImage.Data) and
         (PByte(MiniPixel.Pixel) < (Bitmap.RawImage.Data + yy * MiniPixel.BytesPerLine)) then begin
-          MiniPixel.Pixel^.B := ((cm shr 16) and $FF) * Brightness div 3;
-          MiniPixel.Pixel^.G := ((cm shr 8) and $FF) * Brightness div 3;
-          MiniPixel.Pixel^.R := ((cm shr 0) and $FF) * Brightness div 3;
+          MiniPixel.PixelB := ((cm shr 16) and $FF) * Brightness div 3;
+          MiniPixel.PixelG := ((cm shr 8) and $FF) * Brightness div 3;
+          MiniPixel.PixelR := ((cm shr 0) and $FF) * Brightness div 3;
         end;
       end;
@@ -232 +232 @@
               if (PByte(PrevMiniPixel.Pixel) >= Bitmap.RawImage.Data) and
               (PByte(PrevMiniPixel.Pixel) < (Bitmap.RawImage.Data + yy * PrevMiniPixel.BytesPerLine)) then begin
-                PrevMiniPixel.Pixel^.B := cm shr 16;
-                PrevMiniPixel.Pixel^.G:= cm shr 8 and $FF;
-                PrevMiniPixel.Pixel^.R := cm and $FF;
+                PrevMiniPixel.PixelB := cm shr 16;
+                PrevMiniPixel.PixelG:= cm shr 8 and $FF;
+                PrevMiniPixel.PixelR := cm and $FF;
               end;
             end;
@@ -245 +245 @@
           if (PByte(MiniPixel.Pixel) >= Bitmap.RawImage.Data) and
           (PByte(MiniPixel.Pixel) < (Bitmap.RawImage.Data + yy * MiniPixel.BytesPerLine)) then begin
-            MiniPixel.Pixel^.B := (cm shr 16) and $ff;
-            MiniPixel.Pixel^.G := (cm shr 8) and $ff;
-            MiniPixel.Pixel^.R := (cm shr 0) and $ff;
+            MiniPixel.PixelB := (cm shr 16) and $ff;
+            MiniPixel.PixelG := (cm shr 8) and $ff;
+            MiniPixel.PixelR := (cm shr 0) and $ff;
           end;
         end;
@@ -317 +317 @@
               if (PByte(PrevMiniPixel.Pixel) >= Bitmap.RawImage.Data) and
               (PByte(PrevMiniPixel.Pixel) < (Bitmap.RawImage.Data + yy * PrevMiniPixel.BytesPerLine)) then begin
-                PrevMiniPixel.Pixel^.B := (cm shr 16) and $ff;
-                PrevMiniPixel.Pixel^.G := (cm shr 8) and $ff;
-                PrevMiniPixel.Pixel^.R := (cm shr 0) and $ff;
+                PrevMiniPixel.PixelB := (cm shr 16) and $ff;
+                PrevMiniPixel.PixelG := (cm shr 8) and $ff;
+                PrevMiniPixel.PixelR := (cm shr 0) and $ff;
               end;
             end;
@@ -342 +342 @@
           if (PByte(MiniPixel.Pixel) >= Bitmap.RawImage.Data) and
           (PByte(MiniPixel.Pixel) < (Bitmap.RawImage.Data + yy * MiniPixel.BytesPerLine)) then begin
-            MiniPixel.Pixel^.B := (cm shr 16) and $ff;
-            MiniPixel.Pixel^.G := (cm shr 8) and $ff;
-            MiniPixel.Pixel^.R := (cm shr 0) and $ff;
+            MiniPixel.PixelB := (cm shr 16) and $ff;
+            MiniPixel.PixelG := (cm shr 8) and $ff;
+            MiniPixel.PixelR := (cm shr 0) and $ff;
           end;
         end;