From c6e498585bf7c9d3cbb29f0cc851a24ca956d171 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Sun, 22 Mar 2020 17:08:13 +0000 Subject: [PATCH] LazMapViewer: Add icon for BGRADrawingEngine to resource. Less hints. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7338 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/lazmapviewer/images/imagelist.txt | 3 +++ components/lazmapviewer/lazmapviewer_bgra.lpk | 20 +++++++++--------- .../addons/bgra_drawingengine/mvde_bgra.pas | 6 ++---- .../mvde_rgbgraphics.pas | 5 ++--- components/lazmapviewer/source/mvde_lcl.pas | 2 +- components/lazmapviewer/source/mvgeonames.pas | 2 +- components/lazmapviewer/source/mvjobqueue.pas | 2 +- .../lazmapviewer/source/mvmapviewer.pas | 2 +- .../lazmapviewer/source/mvmapviewer_icons.res | Bin 24291 -> 29165 bytes 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/components/lazmapviewer/images/imagelist.txt b/components/lazmapviewer/images/imagelist.txt index 867b1b68c..71958ff94 100644 --- a/components/lazmapviewer/images/imagelist.txt +++ b/components/lazmapviewer/images/imagelist.txt @@ -13,3 +13,6 @@ tmvdesynapse_200.png tmvrgbgraphicsdrawingengine.png tmvrgbgraphicsdrawingengine_150.png tmvrgbgraphicsdrawingengine_200.png +tmvbgradrawingengine.png +tmvbgradrawingengine_150.png +tmvbgradrawingengine_200.png diff --git a/components/lazmapviewer/lazmapviewer_bgra.lpk b/components/lazmapviewer/lazmapviewer_bgra.lpk index 2fa552fd3..596ba49a4 100644 --- a/components/lazmapviewer/lazmapviewer_bgra.lpk +++ b/components/lazmapviewer/lazmapviewer_bgra.lpk @@ -14,23 +14,23 @@ - - + + - + - - + + - - + + - - + + - + diff --git a/components/lazmapviewer/source/addons/bgra_drawingengine/mvde_bgra.pas b/components/lazmapviewer/source/addons/bgra_drawingengine/mvde_bgra.pas index db6120928..7258e059a 100644 --- a/components/lazmapviewer/source/addons/bgra_drawingengine/mvde_bgra.pas +++ b/components/lazmapviewer/source/addons/bgra_drawingengine/mvde_bgra.pas @@ -116,8 +116,6 @@ procedure TMvBGRADrawingEngine.DrawLazIntfImage(X, Y: Integer; //http://mantis.freepascal.org/view.php?id=27144 var temp: TBGRABitmap; - rawImg: TRawImage; - intfImg: TLazIntfImage; begin temp:=TBGRABitmap.Create(AImg); try @@ -354,7 +352,7 @@ begin img := bmp.CreateIntfImage; try fc := TColorToFPColor(bmp.Canvas.Font.Color); - intens0 := (fc.Red + fc.Green + fc.Blue); + intens0 := Int64(fc.Red) + fc.Green + fc.Blue; for j := 0 to img.Height - 1 do for i := 0 to img.Width - 1 do begin c := bmp.Canvas.Pixels[i, j]; @@ -364,7 +362,7 @@ begin else if c = FFontColor then tc.Alpha := alphaOpaque else begin - intens := tc.Red + tc.Green + tc.Blue; + intens := Int64(tc.Red) + tc.Green + tc.Blue; if intens0 = 0 then alpha := (3 * alphaopaque - intens) / (3 * alphaOpaque - intens0) else diff --git a/components/lazmapviewer/source/addons/rgbgraphics_drawingengine/mvde_rgbgraphics.pas b/components/lazmapviewer/source/addons/rgbgraphics_drawingengine/mvde_rgbgraphics.pas index 28a3301f2..0a39d4749 100644 --- a/components/lazmapviewer/source/addons/rgbgraphics_drawingengine/mvde_rgbgraphics.pas +++ b/components/lazmapviewer/source/addons/rgbgraphics_drawingengine/mvde_rgbgraphics.pas @@ -115,7 +115,6 @@ procedure TMvRGBGraphicsDrawingEngine.DrawLazIntfImage(X, Y: Integer; AImg: TLazIntfImage); //http://mantis.freepascal.org/view.php?id=27144 var - temp: TRGB32Bitmap; rawImg: TRawImage; intfImg: TLazIntfImage; begin @@ -363,7 +362,7 @@ begin img := bmp.CreateIntfImage; try fc := TColorToFPColor(bmp.Canvas.Font.Color); - intens0 := (fc.Red + fc.Green + fc.Blue); + intens0 := Int64(fc.Red) + fc.Green + fc.Blue; for j := 0 to img.Height - 1 do for i := 0 to img.Width - 1 do begin c := bmp.Canvas.Pixels[i, j]; @@ -373,7 +372,7 @@ begin else if c = FFontColor then tc.Alpha := alphaOpaque else begin - intens := tc.Red + tc.Green + tc.Blue; + intens := Int64(tc.Red) + tc.Green + tc.Blue; if intens0 = 0 then alpha := (3 * alphaopaque - intens) / (3 * alphaOpaque - intens0) else diff --git a/components/lazmapviewer/source/mvde_lcl.pas b/components/lazmapviewer/source/mvde_lcl.pas index 76bb5be92..b1dcf71f6 100644 --- a/components/lazmapviewer/source/mvde_lcl.pas +++ b/components/lazmapviewer/source/mvde_lcl.pas @@ -33,7 +33,7 @@ type destructor Destroy; override; procedure CreateBuffer(AWidth, AHeight: Integer); override; procedure DrawBitmap(X, Y: Integer; ABitmap: TCustomBitmap; - UseAlphaChannel: Boolean); override; + {%H-}UseAlphaChannel: Boolean); override; procedure DrawLazIntfImage(X, Y: Integer; AImg: TLazIntfImage); override; procedure Ellipse(X1, Y1, X2, Y2: Integer); override; procedure FillRect(X1, Y1, X2, Y2: Integer); override; diff --git a/components/lazmapviewer/source/mvgeonames.pas b/components/lazmapviewer/source/mvgeonames.pas index 7bab828ef..f5529795e 100644 --- a/components/lazmapviewer/source/mvgeonames.pas +++ b/components/lazmapviewer/source/mvgeonames.pas @@ -156,7 +156,7 @@ end; procedure TMvGeoNames.FoundTextHandler(AText: String); var - code: Integer; + {%H-}code: Integer; begin if not FInDataRows or (AText = #10) then exit; diff --git a/components/lazmapviewer/source/mvjobqueue.pas b/components/lazmapviewer/source/mvjobqueue.pas index a26b1ce2b..77660936d 100644 --- a/components/lazmapviewer/source/mvjobqueue.pas +++ b/components/lazmapviewer/source/mvjobqueue.pas @@ -137,7 +137,7 @@ type FTask: integer; protected procedure DoCancel; override; - procedure pTaskStarted(aTask: integer); override; + procedure pTaskStarted({%H-}aTask: integer); override; procedure pTaskEnded(aTask: integer; aExcept: Exception); override; function pGetTask: integer; override; public diff --git a/components/lazmapviewer/source/mvmapviewer.pas b/components/lazmapviewer/source/mvmapviewer.pas index e08fc2add..85399de74 100644 --- a/components/lazmapviewer/source/mvmapviewer.pas +++ b/components/lazmapviewer/source/mvmapviewer.pas @@ -96,7 +96,7 @@ Type procedure ActivateEngine; procedure DblClick; override; procedure DoDrawTile(const TileId: TTileId; X,Y: integer; TileImg: TLazIntfImage); - procedure DoDrawTileInfo(const TileID: TTileID; X,Y: Integer); + procedure DoDrawTileInfo(const {%H-}TileID: TTileID; X,Y: Integer); function DoMouseWheel(Shift: TShiftState; WheelDelta: Integer; MousePos: TPoint): Boolean; override; procedure DoOnResize; override; diff --git a/components/lazmapviewer/source/mvmapviewer_icons.res b/components/lazmapviewer/source/mvmapviewer_icons.res index 8f663b0b430e908d6d314d5f4be9e6c7b7b9c1b0..bf425fe176b1118d52f9eabd79deeb2ee0b3feff 100644 GIT binary patch delta 4497 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