Changeset 52 for trunk/Start.pas

Timestamp:

Jan 11, 2017, 10:14:11 PM (7 years ago)

Author:

chronos

Message:

• Fixed: More Bitmap.ScanLine replaced by direct access to RAWImage data.

File:

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

trunk/Start.pas

@@ -1034 +1034 @@
 
   procedure PaintFileMini;
-  type
-    TLine = array [0 .. 99999999, 0 .. 2] of Byte;
   var
     i, x, y, xm, cm, Tile, OwnColor, EnemyColor: integer;
-    MiniLine, PrevMiniLine: ^TLine;
+    MiniPixel, PrevMiniPixel: PPixel32;
   begin
     OwnColor := GrExt[HGrSystem].Data.Canvas.Pixels[95, 67];
@@ -1047 +1045 @@
     if MiniMode = mmPicture then
     begin
-      MiniLine := nil;
       Mini.BeginUpdate;
-      for y := 0 to MiniHeight - 1 do
-      begin
-        PrevMiniLine := MiniLine;
-        MiniLine := Mini.ScanLine[y];
-        for x := 0 to MiniWidth - 1 do
-          for i := 0 to 1 do
-          begin
+      for y := 0 to MiniHeight - 1 do begin
+        for x := 0 to MiniWidth - 1 do begin
+          for i := 0 to 1 do begin
             xm := (x * 2 + i + y and 1) mod (MiniWidth * 2);
+            MiniPixel := GetBitmapPixelPtr(Mini, xm, y);
             Tile := SaveMap[x + MiniWidth * y];
             if Tile and fTerrain = fUNKNOWN then
@@ -1066 +1060 @@
               else
                 cm := EnemyColor;
-              if PrevMiniLine <> nil then
-              begin // 2x2 city dot covers two scanlines
-                PrevMiniLine[xm, 0] := cm shr 16;
-                PrevMiniLine[xm, 1] := cm shr 8 and $FF;
-                PrevMiniLine[xm, 2] := cm and $FF;
+              if y > 0 then begin
+                // 2x2 city dot covers two lines
+                PrevMiniPixel := GetBitmapPixelPtr(Mini, xm, y - 1);
+                PrevMiniPixel^.B := cm shr 16;
+                PrevMiniPixel^.G:= cm shr 8 and $FF;
+                PrevMiniPixel^.R := cm and $FF;
               end
             end
@@ -1080 +1075 @@
             else
               cm := MiniColors[Tile and fTerrain, i];
-            MiniLine[xm, 0] := cm shr 16;
-            MiniLine[xm, 1] := cm shr 8 and $FF;
-            MiniLine[xm, 2] := cm and $FF;
+            MiniPixel^.B := cm shr 16;
+            MiniPixel^.G:= cm shr 8 and $FF;
+            MiniPixel^.R := cm and $FF;
           end;
+        end;
       end;
       Mini.EndUpdate;