Changeset 323

Timestamp:

Mar 23, 2021, 2:46:42 PM (3 years ago)

Author:

chronos

Message:

• Modified: Created single procedure for unshare/free bitmap before BitBlt use.

Location:

trunk

Files:

• LocalPlayer/CityScreen.pas (modified) (2 diffs)
• LocalPlayer/Draft.pas (modified) (1 diff)
• LocalPlayer/MessgEx.pas (modified) (2 diffs)
• Packages/CevoComponents/EOTButton.pas (modified) (2 diffs)
• Packages/CevoComponents/ScreenTools.pas (modified) (3 diffs)
• Start.pas (modified) (4 diffs)

trunk/LocalPlayer/CityScreen.pas

@@ -259 +259 @@
     AgePrepared := MainTextureAge;
 
-    // TODO: FillRect should not be needed as BitBlt is with SRCCOPY
-    Back.Canvas.FillRect(0, 0, ClientWidth, ClientHeight);
-
+    UnshareBitmap(Back);
     BitBltCanvas(Back.Canvas, 0, 0, ClientWidth, ClientHeight,
       MainTexture.Image.Canvas, 0, 0);
@@ -358 +356 @@
 procedure TCityDlg.InitZoomCityMap;
 begin
-  // TODO: FillRect should not be needed as BitBlt is with SRCCOPY
-  ZoomCityMap.Canvas.FillRect(0, 0, ZoomCityMap.Width, ZoomCityMap.Height);
-
+  UnshareBitmap(ZoomCityMap);
   BitBltCanvas(ZoomCityMap.Canvas, 0, 0, wZoomMap, hZoomMap,
     Back.Canvas, xZoomMap, yZoomMap);

trunk/LocalPlayer/Draft.pas

@@ -233 +233 @@
 begin
   inherited;
-  // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it
-  Back.Canvas.FillRect(0, 0, Back.Width, Back.Height);
+  UnshareBitmap(Back);
 
   ClientHeight := Template.Height - Cut;

trunk/LocalPlayer/MessgEx.pas

@@ -292 +292 @@
 
   // paint
-  // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it
-  LogoBuffer.Canvas.FillRect(0, 0, LogoBuffer.Width, LogoBuffer.Height);
+  UnshareBitmap(LogoBuffer);
   BitBltCanvas(LogoBuffer.Canvas, 0, 0, BookRect.Width, BookRect.Height, ca, x, y);
 
@@ -374 +373 @@
       begin
         p1 := MyRO.Wonder[IconIndex].EffectiveOwner;
-        // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it
-        Buffer.Canvas.FillRect(0, 0, 1, 1);
+        UnshareBitmap(Buffer);
         BitBltCanvas(Buffer.Canvas, 0, 0, xSizeBig + 2 * GlowRange,
           ySizeBig + 2 * GlowRange, Canvas,

trunk/Packages/CevoComponents/EOTButton.pas

@@ -74 +74 @@
 begin
   with Canvas do
-    if FGraphic <> nil then
-    begin
-      // TODO: For some reason BitBlt is not working with gray background here
-      //BitBltCanvas(Buffer.Canvas, 0, 0, 48, 48, Back.Canvas, 0, 0);
-      Buffer.Canvas.Draw(0, 0, Back);
+    if FGraphic <> nil then begin
+      UnshareBitmap(Buffer);
+      BitBltCanvas(Buffer.Canvas, 0, 0, 48, 48, Back.Canvas, 0, 0);
       ImageOp_CBC(Buffer, Template, 0, 0, 133, 149 + 48 * Byte(FDown), 48, 48,
         $000000, $FFFFFF);
@@ -85 +83 @@
           $000000, $FFFFFF);
       BitBltCanvas(Canvas, 0, 0, 48, 48, Buffer.Canvas, 0, 0);
-    end
-    else
-    begin
+    end else begin
       Brush.Color := $0000FF;
       FrameRect(Rect(0, 0, 48, 48))

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -109 +109 @@
 function ScaleToNative(Value: Integer): Integer;
 function ScaleFromNative(Value: Integer): Integer;
+procedure UnshareBitmap(Bitmap: TBitmap);
 
 const
@@ -1514 +1515 @@
 procedure PaintLogo(Canvas: TCanvas; X, Y, LightColor, ShadeColor: Integer);
 begin
-  // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it
-  LogoBuffer.Canvas.FillRect(0, 0, LogoBuffer.Width, LogoBuffer.Height);
+  UnshareBitmap(LogoBuffer);
   BitBltCanvas(LogoBuffer.Canvas, 0, 0, Logo.Width, Logo.Height, Canvas, X, Y);
   ImageOp_BCC(LogoBuffer, Templates.Data, Point(0, 0), Logo.BoundsRect,
@@ -1626 +1626 @@
 begin
   Result := Value;
+end;
+
+procedure UnshareBitmap(Bitmap: TBitmap);
+begin
+  // FillRect cause image data to be freed so subsequent BitBlt can access valid image data
+  Bitmap.Canvas.FillRect(0, 0, 0, 0);
 end;
 

trunk/Start.pas

@@ -503 +503 @@
     $000000, xAction, y + 21, Phrases2.Lookup(TextItem));
 
-  // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it
-  LogoBuffer.Canvas.FillRect(0, 0, LogoBuffer.Width, LogoBuffer.Height);
+  UnshareBitmap(LogoBuffer);
   BitBltCanvas(LogoBuffer.Canvas, 0, 0, 50, 50, Canvas,
     xActionIcon - 2, y - 2);
@@ -603 +602 @@
 
   // Paint menu logo
-  // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it
-  LogoBuffer.Canvas.FillRect(0, 0, LogoBuffer.Width, LogoBuffer.Height);
+  UnshareBitmap(LogoBuffer);
   BitBltCanvas(LogoBuffer.Canvas, 0, 0, MenuLogo.Width, MenuLogo.Height, Canvas, 6,
     3 + 2 * integer(Tab <> tbMain));
@@ -627 +625 @@
           h := ClientHeight - ActionBottomBorder -
             (yAction + Integer(SelectedAction) * ActionPitch - 8);
-        // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it
-        LogoBuffer.Canvas.FillRect(0, 0, LogoBuffer.Width, LogoBuffer.Height);
+
+        UnshareBitmap(LogoBuffer);
         BitBltCanvas(LogoBuffer.Canvas, 0, 0, w, h, Canvas,
           ActionSideBorder + i * wBuffer, yAction + Integer(SelectedAction) * ActionPitch
@@ -653 +651 @@
                 Format(Phrases2.Lookup('ACTIONHEADER_WEB'), [CevoHomepageShort]));
               Canvas.Font.Assign(UniFont[ftNormal]);
-              // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it
-              LogoBuffer.Canvas.FillRect(0, 0, LogoBuffer.Width, LogoBuffer.Height);
+
+              UnshareBitmap(LogoBuffer);
               BitBltCanvas(LogoBuffer.Canvas, 0, 0, LinkArrows.Width, LinkArrows.Height, Canvas,
                 xActionIcon, y + 2);