Changeset 206 for trunk/Packages/CevoComponents

Timestamp:

May 8, 2020, 6:12:35 PM (5 years ago)

Author:

chronos

Message:

• Modified: Remove warnings about uninitialized TPixelPointer variables. Initialize that types using PixelPointer function in similar way how TPoint is inicialized using Point function.

Location:

trunk/Packages/CevoComponents

Files:

• CevoComponents.lpk (modified) (1 diff)
• CevoComponents.pas (modified) (1 diff)
• ScreenTools.pas (modified) (11 diffs)
• UPixelPointer.pas (moved) (moved from trunk/Packages/CevoComponents/PixelPointer.pas ) (3 diffs)

trunk/Packages/CevoComponents/CevoComponents.lpk

@@ -99 +99 @@
       </Item13>
       <Item14>
-        <Filename Value="PixelPointer.pas"/>
-        <UnitName Value="PixelPointer"/>
+        <Filename Value="UPixelPointer.pas"/>
+        <UnitName Value="UPixelPointer"/>
       </Item14>
     </Files>

trunk/Packages/CevoComponents/CevoComponents.pas

@@ -10 +10 @@
 uses
   Area, ButtonA, ButtonB, ButtonC, ButtonN, EOTButton, ButtonBase, DrawDlg, 
-  Sound, BaseWin, PixelPointer, LazarusPackageIntf;
+  Sound, BaseWin, UPixelPointer, LazarusPackageIntf;
 
 implementation

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -208 +208 @@
 
 uses
-  Directories, Sound, PixelPointer;
+  Directories, Sound, UPixelPointer;
 
 var
@@ -360 +360 @@
 begin
   Bitmap.BeginUpdate;
-  PixelPtr.Init(Bitmap);
+  PixelPtr := PixelPointer(Bitmap);
   for Y := 0 to Bitmap.Height - 1 do begin
     for X := 0 to Bitmap.Width - 1 do begin
@@ -377 +377 @@
 begin
   //Dst.SetSize(Src.Width, Src.Height);
-  SrcPtr.Init(Src);
-  DstPtr.Init(Dst);
+  SrcPtr := PixelPointer(Src);
+  DstPtr := PixelPointer(Dst);
   for Y := 0 to Src.Height - 1 do begin
     for X := 0 to Src.Width - 1 do begin
@@ -501 +501 @@
     GrExt[nGrExt].Data.BeginUpdate;
     GrExt[nGrExt].Mask.BeginUpdate;
-    DataPixel.Init(GrExt[nGrExt].Data);
-    MaskPixel.Init(GrExt[nGrExt].Mask);
+    DataPixel := PixelPointer(GrExt[nGrExt].Data);
+    MaskPixel := PixelPointer(GrExt[nGrExt].Mask);
     for y := 0 to Source.Height - 1 do begin
       for x := 0 to xmax - 1 do begin
@@ -542 +542 @@
 begin
   Dst.BeginUpdate;
-  PixelPtr.Init(Dst, X, Y);
+  PixelPtr := PixelPointer(Dst, X, Y);
   for yy := 0 to Height - 1 do begin
     for xx := 0 to Width - 1 do begin
@@ -585 +585 @@
   dst.BeginUpdate;
   Src.BeginUpdate;
-  PixelDst.Init(Dst, xDst, yDst);
-  PixelSrc.Init(Src, xSrc, ySrc);
+  PixelDst := PixelPointer(Dst, xDst, yDst);
+  PixelSrc := PixelPointer(Src, xSrc, ySrc);
   for Y := 0 to h - 1 do begin
     for X := 0 to w - 1 do  begin
@@ -644 +644 @@
   Src.BeginUpdate;
   dst.BeginUpdate;
-  SrcPixel.Init(Src, xSrc, ySrc);
-  DstPixel.Init(Dst, xDst, yDst);
+  SrcPixel := PixelPointer(Src, xSrc, ySrc);
+  DstPixel := PixelPointer(Dst, xDst, yDst);
   for iy := 0 to Height - 1 do begin
     for ix := 0 to Width - 1 do begin
@@ -687 +687 @@
   assert(bmp.PixelFormat = pf24bit);
   h := y + h;
-  PixelPtr.Init(Bmp, x, y);
+  PixelPtr := PixelPointer(Bmp, x, y);
   while y < h do begin
     for i := 0 to w - 1 do begin
@@ -837 +837 @@
 begin
   dst.BeginUpdate;
-  DstPtr.Init(dst, x0, y0);
+  DstPtr := PixelPointer(dst, x0, y0);
   for y := -GlowRange + 1 to Height - 1 + GlowRange - 1 do begin
     for x := -GlowRange + 1 to Width - 1 + GlowRange - 1 do begin
@@ -1433 +1433 @@
   TexWidth := Texture.Width;
   TexHeight := Texture.Height;
-  DstPixel.Init(Dest);
-  SrcPixel.Init(Texture);
+  DstPixel := PixelPointer(Dest);
+  SrcPixel := PixelPointer(Texture);
   for Y := 0 to Dest.Height - 1 do begin
     for X := 0 to Dest.Width - 1 do begin
@@ -1456 +1456 @@
 begin
   Bitmap.BeginUpdate;
-  PicturePixel.Init(Bitmap);
+  PicturePixel := PixelPointer(Bitmap);
   for y := 0 to Bitmap.Height - 1 do begin
     for x := 0 to Bitmap.Width - 1 do begin

trunk/Packages/CevoComponents/UPixelPointer.pas

@@ -1 @@
-unit PixelPointer;
+unit UPixelPointer;
 
 interface
@@ -31 +31 @@
     procedure SetXY(X, Y: Integer); inline; // Set pixel position relative to base
     procedure SetX(X: Integer); inline; // Set horizontal pixel position relative to base
-    procedure Init(Bitmap: TRasterImage; BaseX: Integer = 0; BaseY: Integer = 0); inline;
   end;
   PPixelPointer = ^TPixelPointer;
+
+  function PixelPointer(Bitmap: TRasterImage; BaseX: Integer = 0; BaseY: Integer = 0): TPixelPointer; inline;
 
 
@@ -62 +63 @@
 end;
 
-procedure TPixelPointer.Init(Bitmap: TRasterImage; BaseX: Integer = 0;
-  BaseY: Integer = 0); inline;
+function PixelPointer(Bitmap: TRasterImage; BaseX: Integer;
+  BaseY: Integer): TPixelPointer;
 begin
-  BytesPerLine := Bitmap.RawImage.Description.BytesPerLine;
-  BytesPerPixel := Bitmap.RawImage.Description.BitsPerPixel shr 3;
-  Base := PPixel32(Bitmap.RawImage.Data + BaseX * BytesPerPixel + BaseY * BytesPerLine);
-  SetXY(0, 0);
+  Result.BytesPerLine := Bitmap.RawImage.Description.BytesPerLine;
+  Result.BytesPerPixel := Bitmap.RawImage.Description.BitsPerPixel shr 3;
+  Result.Base := PPixel32(Bitmap.RawImage.Data + BaseX * Result.BytesPerPixel +
+    BaseY * Result.BytesPerLine);
+  Result.SetXY(0, 0);
 end;