Changeset 206

Timestamp:

May 8, 2020, 6:12:35 PM (4 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

Files:

• LocalPlayer/CityScreen.pas (modified) (2 diffs)
• LocalPlayer/Help.pas (modified) (2 diffs)
• LocalPlayer/IsoEngine.pas (modified) (4 diffs)
• LocalPlayer/MessgEx.pas (modified) (2 diffs)
• LocalPlayer/Term.pas (modified) (4 diffs)
• LocalPlayer/Wonders.pas (modified) (3 diffs)
• Packages/CevoComponents/CevoComponents.lpk (modified) (1 diff)
• Packages/CevoComponents/CevoComponents.pas (modified) (1 diff)
• Packages/CevoComponents/ScreenTools.pas (modified) (11 diffs)
• Packages/CevoComponents/UPixelPointer.pas (moved) (moved from trunk/Packages/CevoComponents/PixelPointer.pas ) (3 diffs)
• Start.pas (modified) (3 diffs)

trunk/LocalPlayer/CityScreen.pas

@@ -90 +90 @@
 
 uses
-  Select, Messg, MessgEx, Help, Tribes, Directories, Math, PixelPointer, Sound;
+  Select, Messg, MessgEx, Help, Tribes, Directories, Math, UPixelPointer, Sound;
 
 {$R *.lfm}
@@ -443 +443 @@
   begin
     Offscreen.BeginUpdate;
-    PixelPtr.Init(Offscreen, X, Y);
+    PixelPtr := PixelPointer(Offscreen, X, Y);
     for YY := 0 to H - 1 do begin
       for XX := 0 to W - 1 do begin

trunk/LocalPlayer/Help.pas

@@ -127 +127 @@
 
 uses
-  Directories, ClientTools, Term, Tribes, Inp, Messg, PixelPointer, Global;
+  Directories, ClientTools, Term, Tribes, Inp, Messg, UPixelPointer, Global;
 
 {$R *.lfm}
@@ -459 +459 @@
   for y := 0 to ySizeBig * 2 - 1 do
     if ((y0 + y) >= 0) and ((y0 + y) < InnerHeight) then begin
-      PaintPtr.Init(OffScreen, 0, y0 + y);
-      CoalPtr.Init(Templates, 0, yCoal + y);
+      PaintPtr := PixelPointer(OffScreen, 0, y0 + y);
+      CoalPtr := PixelPointer(Templates, 0, yCoal + y);
       for dy := -1 to 1 do
         if ((Max(y + dy, 0) shr 1) >= 0) and ((Max(y + dy, 0) shr 1) < ySizeBig) then
-          ImpPtr[dy].Init(BigImp, 0, ySrc + (Max(y + dy, 0) shr 1));
+          ImpPtr[dy] := PixelPointer(BigImp, 0, ySrc + (Max(y + dy, 0) shr 1));
       for x := 0 to xSizeBig * 2 - 1 do begin
         sum := 0;

trunk/LocalPlayer/IsoEngine.pas

@@ -6 +6 @@
 uses
   Protocol, ClientTools, ScreenTools, Tribes, {$IFNDEF SCR}Term, {$ENDIF}
-  LCLIntf, LCLType, SysUtils, Classes, Graphics, PixelPointer;
+  LCLIntf, LCLType, SysUtils, Classes, Graphics, UPixelPointer;
 
 type
@@ -375 +375 @@
   begin
     for i := 0 to yyt * 3 - 1 do
-      MaskLine[i].Init(Mask24, 0, 1 + ySrc * (yyt * 3 + 1) + i);
+      MaskLine[i] := PixelPointer(Mask24, 0, 1 + ySrc * (yyt * 3 + 1) + i);
     for xSrc := 0 to 9 - 1 do
     begin
@@ -1017 +1017 @@
           for dy := 0 to yyt * 2 - 1 do
           begin
-            PixelPtr.Init(Borders, 0, p1 * (yyt * 2) + dy);
+            PixelPtr := PixelPointer(Borders, 0, p1 * (yyt * 2) + dy);
             for dx := 0 to xxt * 2 - 1 do begin
               if PixelPtr.Pixel^.B = 99 then begin
@@ -1340 +1340 @@
   FOutput.BeginUpdate;
   for y := y0 to y1 - 1 do begin
-    Line.Init(FOutput, 0, y);
+    Line := PixelPointer(FOutput, 0, y);
     y_n := (y - ym) / yyt;
     if abs(y_n) < rShade then begin

trunk/LocalPlayer/MessgEx.pas

@@ -73 +73 @@
 
 uses
-  ClientTools, BaseWin, Term, Help, UnitStat, Tribes, PixelPointer,
+  ClientTools, BaseWin, Term, Help, UnitStat, Tribes, UPixelPointer,
   IsoEngine, Diagram, Sound;
 
@@ -246 +246 @@
     for iy := 0 to 39 do begin
       for ix := 0 to 55 do begin
-        SrcPtr.Init(BigImp, ix + xIcon, iy + yIcon);
+        SrcPtr := PixelPointer(BigImp, ix + xIcon, iy + yIcon);
         xR := ix * (37 + iy * 5 / 40) / 56;
         xDst := Trunc(xR);

trunk/LocalPlayer/Term.pas

@@ -481 +481 @@
 uses
   Directories, IsoEngine, CityScreen, Draft, MessgEx, Select, CityType, Help,
-  UnitStat, Log, Diagram, NatStat, Wonders, Enhance, Nego, PixelPointer, Sound,
+  UnitStat, Log, Diagram, NatStat, Wonders, Enhance, Nego, UPixelPointer, Sound,
   Battle, Rates, TechTree, Registry, Global;
 
@@ -577 +577 @@
         if ydivider > ySizeSmall then
           ydivider := ySizeSmall;
-        PixelPtr.Init(BigImp, 0, cut + iy * ySizeBig + y);
+        PixelPtr := PixelPointer(BigImp, 0, cut + iy * ySizeBig + y);
         for x := 0 to xSizeBig - 1 do
         begin
@@ -610 +610 @@
   SmallImp.BeginUpdate;
   for y := 0 to ny - 1 do begin
-    PixelPtr.Init(SmallImp, 0, y);
+    PixelPtr := PixelPointer(SmallImp, 0, y);
     for x := 0 to nx - 1 do
       for ch := 0 to 2 do begin
@@ -4075 +4075 @@
   end;
   Mini.BeginUpdate;
-  MiniPixel.Init(Mini);
-  PrevMiniPixel.Init(Mini);
+  MiniPixel := PixelPointer(Mini);
+  PrevMiniPixel := PixelPointer(Mini);
   for y := 0 to G.ly - 1 do
   begin

trunk/LocalPlayer/Wonders.pas

@@ -38 +38 @@
 
 uses
-  Term, ClientTools, Help, Tribes, PixelPointer;
+  Term, ClientTools, Help, Tribes, UPixelPointer;
 
 {$R *.lfm}
@@ -106 +106 @@
 begin
   Offscreen.BeginUpdate;
-  Line[0].Init(Offscreen);
-  Line[1].Init(Offscreen);
+  Line[0] := PixelPointer(Offscreen);
+  Line[1] := PixelPointer(Offscreen);
   for Y := 0 to 127 do begin
     for X := 0 to 179 do begin
@@ -144 +144 @@
   x0Src := (i mod 7) * xSizeBig;
   y0Src := (i div 7 + SystemIconLines) * ySizeBig;
-  Src.Init(BigImp, x0Src, y0Src);
-  Dst.Init(Offscreen, x0Dst, y0Dst);
+  Src := PixelPointer(BigImp, x0Src, y0Src);
+  Dst := PixelPointer(Offscreen, x0Dst, y0Dst);
   for Y := 0 to ySizeBig - 1 do begin
     for X := 0 to xSizeBig - 1 do begin

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;
 

trunk/Start.pas

@@ -165 +165 @@
 
 uses
-  Global, Directories, Direct, ScreenTools, Inp, Back, Locale, PixelPointer;
+  Global, Directories, Direct, ScreenTools, Inp, Back, Locale, UPixelPointer;
 
 {$R *.lfm}
@@ -354 +354 @@
   Bitmap.SetSize(Size.X * 2, Size.Y);
   Bitmap.BeginUpdate;
-  MiniPixel.Init(Bitmap);
+  MiniPixel := PixelPointer(Bitmap);
   for y := 0 to Size.Y - 1 do begin
     for x := 0 to Size.X - 1 do begin
@@ -386 +386 @@
   if Mode = mmPicture then begin
     Bitmap.BeginUpdate;
-    MiniPixel.Init(Bitmap);
-    PrevMiniPixel.Init(Bitmap, 0, -1);
+    MiniPixel := PixelPointer(Bitmap);
+    PrevMiniPixel := PixelPointer(Bitmap, 0, -1);
     for y := 0 to Size.Y - 1 do begin
       for x := 0 to Size.X - 1 do begin