Changeset 21 for trunk/ScreenTools.pas

Timestamp:

Jan 8, 2017, 3:12:18 PM (8 years ago)

Author:

chronos

Message:

• Fixed: Run as 64-bit application. Can't load 32-bit StdAI library in 64-bit mode.
• Fixed: Various Warnings and Hints.

File:

• trunk/ScreenTools.pas (modified) (10 diffs)

trunk/ScreenTools.pas

@@ -9 +9 @@
   {$ENDIF}
   StringTables,
-  LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls,
+  LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls,
   Forms, Menus;
 
@@ -192 +192 @@
 
 uses
-  Directories, Sound, ButtonBase, ButtonA, ButtonB,
-
-  Registry;
+  Directories, Sound, Registry;
 
 var
@@ -386 +384 @@
 procedure ApplyGamma(Start, Stop: pbyte);
 begin
-  while integer(Start) < integer(Stop) do
+  while Start < Stop do
   begin
     Start^ := GammaLUT[Start^];
@@ -443 +441 @@
     FirstLine := bmp.ScanLine[0];
     LastLine := bmp.ScanLine[bmp.Height - 1];
-    if integer(FirstLine) < integer(LastLine) then
+    if FirstLine < LastLine then
       ApplyGamma(pointer(FirstLine), @LastLine[bmp.Width])
     else
@@ -501 +499 @@
     FirstLine := bmp.ScanLine[0];
     LastLine := bmp.ScanLine[bmp.Height - 1];
-    if integer(FirstLine) < integer(LastLine) then
+    if FirstLine < LastLine then
       ApplyGamma(pointer(FirstLine), @LastLine[bmp.Width])
     else
@@ -612 +610 @@
 // X channel = background amp (old Dst content), 128=original brightness
 type
-  TPixel = array [0 .. 2] of Byte;
+  TPixel = array [0..2] of Byte;
+  PPixel = ^TPixel;
 var
   i, Brightness, test: integer;
   PixelSrc: ^Byte;
-  PixelDst: ^TPixel;
+  PixelDst: PPixel;
 begin
   {TODO assert(Src.PixelFormat = pf8bit);}
@@ -642 +641 @@
   while yDst < h do
   begin
-    PixelDst := pointer(integer(dst.ScanLine[yDst]) + 3 * xDst);
-    PixelSrc := pointer(integer(Src.ScanLine[ySrc]) + xSrc);
+    PixelDst := dst.ScanLine[yDst] + 3 * xDst;
+    PixelSrc := Src.ScanLine[ySrc] + xSrc;
     for i := 0 to w - 1 do
     begin
@@ -662 +661 @@
       else
         PixelDst[0] := test; // Blue
-      PixelDst := pointer(integer(PixelDst) + 3);
-      PixelSrc := pointer(integer(PixelSrc) + 1);
+      PixelDst := Pointer(PixelDst) + 3;
+      PixelSrc := Pointer(PixelSrc) + 1;
     end;
     inc(yDst);
@@ -751 +750 @@
   while y < h do
   begin
-    Pixel := pointer(integer(bmp.ScanLine[y]) + 3 * x);
+    Pixel := bmp.ScanLine[y] + 3 * x;
     for i := 0 to w - 1 do
     begin
@@ -764 +763 @@
       Pixel[1] := Green;
       Pixel[2] := Red;
-      Pixel := pointer(integer(Pixel) + 3);
+      Pixel := Pointer(Pixel) + 3;
     end;
     inc(y);