Changeset 62 for trunk/ScreenTools.pas

Timestamp:

Jan 13, 2017, 7:45:16 PM (7 years ago)

Author:

chronos

Message:

• Fixed: Replaced ScanLine access be linux supported pixel access.

File:

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

trunk/ScreenTools.pas

@@ -38 +38 @@
     BytesPerPixel: Integer;
     BytesPerLine: Integer;
-    procedure NextLine;
-    procedure NextPixel;
-    procedure SetXY(X, Y: Integer);
-    procedure SetX(X: Integer);
-    procedure Init(Bitmap: TBitmap; X: Integer = 0; Y: Integer = 0);
+    procedure NextLine; inline;
+    procedure NextPixel; inline;
+    procedure SetXY(X, Y: Integer); inline;
+    procedure SetX(X: Integer); inline;
+    procedure Init(Bitmap: TBitmap; X: Integer = 0; Y: Integer = 0); inline;
   end;
 
@@ -624 +624 @@
 
 procedure MakeBlue(dst: TBitmap; x, y, w, h: integer);
-type
-  TLine = array [0 .. 99999, 0 .. 2] of Byte;
-  PLine = ^TLine;
-
-  procedure BlueLine(line: PLine; Length: integer);
-  var
-    i: integer;
-  begin
-    for i := 0 to Length - 1 do
-    begin
-      line[i, 0] := line[i, 0] div 2;
-      line[i, 1] := line[i, 1] div 2;
-      line[i, 2] := line[i, 2] div 2;
-    end
-  end;
-
-var
-  i: integer;
-begin
-  dst.BeginUpdate;
-  for i := 0 to h - 1 do
-    BlueLine(@(PLine(dst.ScanLine[y + i])[x]), w);
-  dst.EndUpdate;
+var
+  XX, YY: Integer;
+  PixelPtr: TPixelPointer;
+begin
+  Dst.BeginUpdate;
+  PixelPtr.Init(Dst, 0, 0);
+  for yy := 0 to h - 1 do begin
+    for xx := 0 to w - 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.NextPixel;
+    end;
+    PixelPtr.NextLine;
+  end;
+  Dst.EndUpdate;
 end;
 
@@ -916 +909 @@
 
 procedure GlowFrame(dst: TBitmap; x0, y0, Width, Height: integer; cl: TColor);
-type
-  TLine = array [0 .. 649, 0 .. 2] of Byte;
 var
   x, y, ch, r: integer;
-  DstLine: ^TLine;
+  DstPtr: TPixelPointer;
 begin
   dst.BeginUpdate;
   for y := -GlowRange + 1 to Height - 1 + GlowRange - 1 do
   begin
-    DstLine := dst.ScanLine[y0 + y];
     for x := -GlowRange + 1 to Width - 1 + GlowRange - 1 do
     begin
+      DstPtr.Init(dst, x0 + x, y0 + y);
       if x < 0 then
         if y < 0 then
@@ -952 +943 @@
       if r < GlowRange then
         for ch := 0 to 2 do
-          DstLine[x0 + x][2 - ch] :=
-            (DstLine[x0 + x][2 - ch] * (r - 1) + (cl shr (8 * ch) and $FF) *
+          DstPtr.Pixel^.Planes[2 - ch] :=
+            (DstPtr.Pixel^.Planes[2 - ch] * (r - 1) + (cl shr (8 * ch) and $FF) *
             (GlowRange - r)) div (GlowRange - 1);
     end;