Changeset 39 for trunk/ScreenTools.pas

Timestamp:

Jan 9, 2017, 7:58:25 PM (7 years ago)

Author:

chronos

Message:

• Fixed: Retyping from pointer to integer doesn't work on 64-bit architecture.
• Fixed: Do not use CreateWindowEx for scrollbar under Linux.
• Fixed: Warning about unintialized record fields.

File:

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

trunk/ScreenTools.pas

@@ -238 +238 @@
 {$ENDIF}
 begin
+  Result := False;
 {$IFNDEF DEBUG}
   if (Sounds = nil) or (SoundMode = smOff) or (Item = '') then
@@ -386 +387 @@
 procedure ApplyGamma(Start, Stop: pbyte);
 begin
-  while integer(Start) < integer(Stop) do
+  while Start < Stop do
   begin
     Start^ := GammaLUT[Start^];
@@ -444 +445 @@
     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
@@ -504 +505 @@
     FirstLine := bmp.ScanLine[0];
     LastLine := bmp.ScanLine[bmp.Height - 1];
-    if integer(FirstLine) < integer(LastLine) then
-      ApplyGamma(pointer(FirstLine), @LastLine[bmp.Width])
+    if FirstLine < LastLine then
+      ApplyGamma(Pointer(FirstLine), @LastLine[bmp.Width])
     else
-      ApplyGamma(pointer(LastLine), @FirstLine[bmp.Width]);
+      ApplyGamma(Pointer(LastLine), @FirstLine[bmp.Width]);
     bmp.EndUpdate;
   end
@@ -649 +650 @@
 
   dst.BeginUpdate;
+  Src.BeginUpdate;
   h := yDst + h;
   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
@@ -672 +674 @@
       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);
     inc(ySrc);
   end;
+  src.EndUpdate;
   dst.EndUpdate;
 end;
@@ -763 +766 @@
   while y < h do
   begin
-    Pixel := pointer(integer(bmp.ScanLine[y]) + 3 * x);
+    Pixel := pointer(bmp.ScanLine[y]) + 3 * x;
     for i := 0 to w - 1 do
     begin
@@ -776 +779 @@
       Pixel[1] := Green;
       Pixel[2] := Red;
-      Pixel := pointer(integer(Pixel) + 3);
+      Pixel := pointer(Pixel) + 3;
     end;
     inc(y);