Changeset 506 for trunk/Packages/CevoComponents/ScreenTools.pas

Timestamp:

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

Author:

chronos

Message:

• Fixed: Better PixelPointer range checking.

File:

• trunk/Packages/CevoComponents/ScreenTools.pas (modified) (14 diffs)

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -404 +404 @@
   for Y := 0 to ScaleToNative(Src.Height - 1) do begin
     for X := 0 to ScaleToNative(Src.Width - 1) do begin
-      DstPtr.Pixel^.B := SrcPtr.Pixel^.B;
-      DstPtr.Pixel^.G := SrcPtr.Pixel^.B;
-      DstPtr.Pixel^.R := SrcPtr.Pixel^.B;
+      DstPtr.PixelB := SrcPtr.PixelB;
+      DstPtr.PixelG := SrcPtr.PixelB;
+      DstPtr.PixelR := SrcPtr.PixelB;
       SrcPtr.NextPixel;
       DstPtr.NextPixel;
@@ -536 +536 @@
       for Y := 0 to ScaleToNative(Result.Data.Height) - 1 do begin
         for X := 0 to ScaleToNative(Result.Data.Width) - 1 do begin
-          OriginalColor := DataPixel.Pixel^.ARGB and $FFFFFF;
+          OriginalColor := DataPixel.PixelARGB and $FFFFFF;
           if (OriginalColor = TransparentColor1) or (OriginalColor = TransparentColor2) then begin
-            MaskPixel.Pixel^.R := $FF;
-            MaskPixel.Pixel^.G := $FF;
-            MaskPixel.Pixel^.B := $FF;
-            DataPixel.Pixel^.R := 0;
-            DataPixel.Pixel^.G := 0;
-            DataPixel.Pixel^.B := 0;
+            MaskPixel.PixelR := $FF;
+            MaskPixel.PixelG := $FF;
+            MaskPixel.PixelB := $FF;
+            DataPixel.PixelR := 0;
+            DataPixel.PixelG := 0;
+            DataPixel.PixelB := 0;
           end else begin
-            MaskPixel.Pixel^.R := $00;
-            MaskPixel.Pixel^.G := $00;
-            MaskPixel.Pixel^.B := $00;
+            MaskPixel.PixelR := $00;
+            MaskPixel.PixelG := $00;
+            MaskPixel.PixelB := $00;
           end;
           DataPixel.NextPixel;
@@ -579 +579 @@
   for YY := 0 to ScaleToNative(Height) - 1 do begin
     for XX := 0 to ScaleToNative(Width) - 1 do begin
-      if PixelPtr.Pixel^.RGB = SwapRedBlue(OldColor) then begin
-        PixelPtr.Pixel^.RGB := SwapRedBlue(NewColor);
+      if PixelPtr.PixelRGB = SwapRedBlue(OldColor) then begin
+        PixelPtr.PixelRGB := SwapRedBlue(NewColor);
       end;
       PixelPtr.NextPixel;
@@ -598 +598 @@
   for yy := 0 to ScaleToNative(Height) - 1 do begin
     for xx := 0 to ScaleToNative(Width) - 1 do begin
-      PixelPtr.Pixel^.B := PixelPtr.Pixel^.B div 2;
-      PixelPtr.Pixel^.G := PixelPtr.Pixel^.G div 2;
-      PixelPtr.Pixel^.R := PixelPtr.Pixel^.R div 2;
+      PixelPtr.PixelB := PixelPtr.PixelB div 2;
+      PixelPtr.PixelG := PixelPtr.PixelG div 2;
+      PixelPtr.PixelR := PixelPtr.PixelR div 2;
       PixelPtr.NextPixel;
     end;
@@ -618 +618 @@
   for YY := 0 to ScaleToNative(Height) - 1 do begin
     for XX := 0 to ScaleToNative(Width) - 1 do begin
-      Gray := (Integer(PixelPtr.Pixel^.B) + Integer(PixelPtr.Pixel^.G) +
-        Integer(PixelPtr.Pixel^.R)) * 85 shr 8;
-      PixelPtr.Pixel^.B := 0;
-      PixelPtr.Pixel^.G := 0;
-      PixelPtr.Pixel^.R := Gray; // 255-(255-gray) div 2;
+      Gray := (Integer(PixelPtr.PixelB) + Integer(PixelPtr.PixelG) +
+        Integer(PixelPtr.PixelR)) * 85 shr 8;
+      PixelPtr.PixelB := 0;
+      PixelPtr.PixelG := 0;
+      PixelPtr.PixelR := Gray; // 255-(255-gray) div 2;
       PixelPtr.NextPixel;
     end;
@@ -670 +670 @@
   for Y := 0 to Height - 1 do begin
     for X := 0 to Width - 1 do  begin
-      Brightness := PixelSrc.Pixel^.B; // One byte for 8-bit color
-      Test := (PixelDst.Pixel^.R * Brightness) shr 7;
+      Brightness := PixelSrc.PixelB; // One byte for 8-bit color
+      Test := (PixelDst.PixelR * Brightness) shr 7;
       if Test >= 256 then
-        PixelDst.Pixel^.R := 255
+        PixelDst.PixelR := 255
       else
-        PixelDst.Pixel^.R := Test; // Red
-      Test := (PixelDst.Pixel^.G * Brightness) shr 7;
+        PixelDst.PixelR := Test; // Red
+      Test := (PixelDst.PixelG * Brightness) shr 7;
       if Test >= 256 then
-        PixelDst.Pixel^.G := 255
+        PixelDst.PixelG := 255
       else
-        PixelDst.Pixel^.G := Test; // Green
-      Test := (PixelDst.Pixel^.B * Brightness) shr 7;
+        PixelDst.PixelG := Test; // Green
+      Test := (PixelDst.PixelB * Brightness) shr 7;
       if Test >= 256 then
-        PixelDst.Pixel^.R := 255
+        PixelDst.PixelR := 255
       else
-        PixelDst.Pixel^.B := Test; // Blue
+        PixelDst.PixelB := Test; // Blue
       PixelDst.NextPixel;
       PixelSrc.NextPixel;
@@ -736 +736 @@
   for iy := 0 to Height - 1 do begin
     for ix := 0 to Width - 1 do begin
-      trans := SrcPixel.Pixel^.B * 2; // green channel = transparency
-      amp1 := SrcPixel.Pixel^.G * 2;
-      amp2 := SrcPixel.Pixel^.R * 2;
+      trans := SrcPixel.PixelB * 2; // green channel = transparency
+      amp1 := SrcPixel.PixelG * 2;
+      amp2 := SrcPixel.PixelR * 2;
       if trans <> $FF then begin
-        Value := (DstPixel.Pixel^.B * trans + ((Color2 shr 16) and $FF) *
+        Value := (DstPixel.PixelB * trans + ((Color2 shr 16) and $FF) *
           amp2 + ((Color1 shr 16) and $FF) * amp1) div $FF;
-        DstPixel.Pixel^.B := Min(Value, 255);
-
-        Value := (DstPixel.Pixel^.G * trans + ((Color2 shr 8) and $FF) *
+        DstPixel.PixelB := Min(Value, 255);
+
+        Value := (DstPixel.PixelG * trans + ((Color2 shr 8) and $FF) *
           amp2 + ((Color1 shr 8) and $FF) * amp1) div $FF;
-        DstPixel.Pixel^.G := Min(Value, 255);
-
-        Value := (DstPixel.Pixel^.R * trans + (Color2 and $FF) *
+        DstPixel.PixelG := Min(Value, 255);
+
+        Value := (DstPixel.PixelR * trans + (Color2 and $FF) *
           amp2 + (Color1 and $FF) * amp1) div $FF;
-        DstPixel.Pixel^.R := Min(Value, 255);
+        DstPixel.PixelR := Min(Value, 255);
       end;
 
@@ -793 +793 @@
   for iy := 0 to Height - 1 do begin
     for ix := 0 to Width - 1 do begin
-      trans := SrcPixel.Pixel^.B * 2; // green channel = transparency
-      amp0 := SrcPixel.Pixel^.G * 2;
-      amp1 := SrcPixel.Pixel^.R * 2;
+      trans := SrcPixel.PixelB * 2; // green channel = transparency
+      amp0 := SrcPixel.PixelG * 2;
+      amp1 := SrcPixel.PixelR * 2;
       if trans <> $FF then begin
-        Value := (DstPixel.Pixel^.B * trans + (Color2 shr 16 and $FF) * amp1 +
+        Value := (DstPixel.PixelB * trans + (Color2 shr 16 and $FF) * amp1 +
           (Color0 shr 16 and $FF) * amp0) div $FF;
-        DstPixel.Pixel^.B := Min(Value, 255);
-
-        Value := (DstPixel.Pixel^.G * trans + (Color2 shr 8 and $FF) * amp1 +
+        DstPixel.PixelB := Min(Value, 255);
+
+        Value := (DstPixel.PixelG * trans + (Color2 shr 8 and $FF) * amp1 +
           (Color0 shr 8 and $FF) * amp0) div $FF;
-        DstPixel.Pixel^.G := Min(Value, 255);
-
-        Value := (DstPixel.Pixel^.R * trans + (Color2 and $FF) * amp1 +
+        DstPixel.PixelG := Min(Value, 255);
+
+        Value := (DstPixel.PixelR * trans + (Color2 and $FF) * amp1 +
           (Color0 and $FF) * amp0) div $FF;
-        DstPixel.Pixel^.R := Min(Value, 255);
+        DstPixel.PixelR := Min(Value, 255);
       end;
       SrcPixel.NextPixel;
@@ -846 +846 @@
   for YY := 0 to Height - 1 do begin
     for XX := 0 to Width - 1 do begin
-      Red := ((PixelPtr.Pixel^.B * (Color0 and $0000FF) + PixelPtr.Pixel^.G *
-        (Color1 and $0000FF) + PixelPtr.Pixel^.R * (Color2 and $0000FF)) shr 8) and $ff;
-      Green := ((PixelPtr.Pixel^.B * ((Color0 shr 8) and $0000FF) +
-        PixelPtr.Pixel^.G * ((Color1 shr 8) and $0000FF) + PixelPtr.Pixel^.R *
+      Red := ((PixelPtr.PixelB * (Color0 and $0000FF) + PixelPtr.PixelG *
+        (Color1 and $0000FF) + PixelPtr.PixelR * (Color2 and $0000FF)) shr 8) and $ff;
+      Green := ((PixelPtr.PixelB * ((Color0 shr 8) and $0000FF) +
+        PixelPtr.PixelG * ((Color1 shr 8) and $0000FF) + PixelPtr.PixelR *
         ((Color2 shr 8) and $0000FF)) shr 8) and $ff;
-      PixelPtr.Pixel^.B := ((PixelPtr.Pixel^.B * ((Color0 shr 16) and $0000FF) +
-        PixelPtr.Pixel^.G * ((Color1 shr 16) and $0000FF) + PixelPtr.Pixel^.R *
+      PixelPtr.PixelB := ((PixelPtr.PixelB * ((Color0 shr 16) and $0000FF) +
+        PixelPtr.PixelG * ((Color1 shr 16) and $0000FF) + PixelPtr.PixelR *
         ((Color2 shr 16) and $0000FF)) shr 8) and $ff; // Blue
-      PixelPtr.Pixel^.G := Green;
-      PixelPtr.Pixel^.R := Red;
+      PixelPtr.PixelG := Green;
+      PixelPtr.PixelR := Red;
       PixelPtr.NextPixel;
     end;
@@ -1035 +1035 @@
       if R < DpiGlowRange then
         for ch := 0 to 2 do
-          DstPtr.Pixel^.Planes[2 - ch] :=
-            (DstPtr.Pixel^.Planes[2 - ch] * (R - 1) + (cl shr (8 * ch) and $FF) *
+          DstPtr.PixelPlane[2 - ch] :=
+            (DstPtr.PixelPlane[2 - ch] * (R - 1) + (cl shr (8 * ch) and $FF) *
             (DpiGlowRange - R)) div (DpiGlowRange - 1);
       DstPtr.NextPixel;
@@ -1063 +1063 @@
     for Y := 0 to ScaleToNative(Ornament.Height) - 1 do begin
       for X := 0 to ScaleToNative(Ornament.Width) - 1 do begin
-        P := Color32ToColor(PixelPtr.Pixel^.RGB);
-        if P = $0000FF then PixelPtr.Pixel^.RGB := Light
-        else if P = $FF0000 then PixelPtr.Pixel^.RGB := Shade;
+        P := Color32ToColor(PixelPtr.PixelRGB);
+        if P = $0000FF then PixelPtr.PixelRGB := Light
+        else if P = $FF0000 then PixelPtr.PixelRGB := Shade;
         PixelPtr.NextPixel;
       end;
@@ -1073 +1073 @@
     for Y := 0 to ScaleToNative(Ornament.Height) - 1 do begin
       for X := 0 to ScaleToNative(Ornament.Width) - 1 do begin
-        P := Color32ToColor(PixelPtr.Pixel^.ARGB);
-        if P = $0000FF then PixelPtr.Pixel^.ARGB := Light
-        else if P = $FF0000 then PixelPtr.Pixel^.ARGB := Shade;
+        P := Color32ToColor(PixelPtr.PixelARGB);
+        if P = $0000FF then PixelPtr.PixelARGB := Light
+        else if P = $FF0000 then PixelPtr.PixelARGB := Shade;
         PixelPtr.NextPixel;
       end;
@@ -1616 +1616 @@
   for Y := 0 to ScaleToNative(Dest.Height) - 1 do begin
     for X := 0 to ScaleToNative(Dest.Width) - 1 do begin
-      if (DstPixel.Pixel^.ARGB and $FFFFFF) = TransparentColor then begin
+      if (DstPixel.PixelARGB and $FFFFFF) = TransparentColor then begin
         SrcPixel.SetXY(X mod TexWidth, Y mod TexHeight);
-        DstPixel.Pixel^.B := SrcPixel.Pixel^.B;
-        DstPixel.Pixel^.G := SrcPixel.Pixel^.G;
-        DstPixel.Pixel^.R := SrcPixel.Pixel^.R;
+        DstPixel.PixelB := SrcPixel.PixelB;
+        DstPixel.PixelG := SrcPixel.PixelG;
+        DstPixel.PixelR := SrcPixel.PixelR;
       end;
       DstPixel.NextPixel;
@@ -1638 +1638 @@
   for Y := 0 to ScaleToNative(Bitmap.Height) - 1 do begin
     for X := 0 to ScaleToNative(Bitmap.Width) - 1 do begin
-      PicturePixel.Pixel^.B := Max(PicturePixel.Pixel^.B - Change, 0);
-      PicturePixel.Pixel^.G := Max(PicturePixel.Pixel^.G - Change, 0);
-      PicturePixel.Pixel^.R := Max(PicturePixel.Pixel^.R - Change, 0);
+      PicturePixel.PixelB := Max(PicturePixel.PixelB - Change, 0);
+      PicturePixel.PixelG := Max(PicturePixel.PixelG - Change, 0);
+      PicturePixel.PixelR := Max(PicturePixel.PixelR - Change, 0);
       PicturePixel.NextPixel;
     end;