paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LazMapViewer: Fix drawing of scaled transparent tiles by BGRABitmap drawing engine.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@9499 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz 2024-11-05 08:39:31 +00:00
parent d7de2eba34
commit 9eec695b86
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/lazmapviewer/source/addons/bgra_drawingengine/mvde_bgra.pas
View File

@ -156,10 +156,7 @@ begin
h := AImage.Height;
if (w <> ANewWidth) or (h <> ANewHeight) then
begin
img := TBGRABitmap.Create(ANewWidth, ANewHeight);
Rsrc := Rect(0, 0, AImage.Width, AImage.Height);
Rdst := Rect(0, 0, ANewWidth, ANewHeight);
img.CanvasBGRA.CopyRect(Rdst, AImage, Rsrc);
img := AImage.Resample(ANewWidth, ANewHeight);
AImage.Free;
AImage := img;
end;
@ -207,9 +204,11 @@ var
Img: TBGRABitmap;
begin
Img := (AImg as TBGRABitmapCacheItem).Image;
if ADrawMode = idmDraw
then FBuffer.CanvasBGRA.Draw(x,y,Img)
else FBuffer.PutImage(x, y, Img, dmDrawWithTransparency, Round(AOpacity * 255));
case ADrawMode of
idmDraw: FBuffer.PutImage(x, y, Img, dmSet);
idmUseOpacity: FBuffer.PutImage(x, y, Img, dmDrawWithTransparency, Round(AOpacity * 255));
idmUseSourceAlpha: FBuffer.CanvasBGRA.Draw(x, y, Img);
end;
end;
procedure TMvBGRADrawingEngine.DrawScaledCacheItem(DestRect, SrcRect: TRect;

1
components/lazmapviewer/source/mvengine_mapreg.inc
View File

@ -43,6 +43,7 @@ Some providers submitted by
// https://www.thunderforest.com/docs/apikeys/
// The API key is found on their website after registration and logging in.
// Store the API key in the ini file under key [ThunderForest] as item API_Key
// Attribution required as "Maps © www.thunderforest.com, Data © www.osm.org/copyright"
AddMapProvider('ThunderForest Open Cycle Map', ptEPSG3857, 'https://tile.thunderforest.com/cycle/%z%/%x%/%y%.png?apikey=' + ThunderForest_ApiKey, 0, 19, 3, nil, nil, nil, nil);
AddMapProvider('ThunderForest OpenStreetMap Transport', ptEPSG3857, 'https://tile.thunderforest.com/transport/%z%/%x%/%y%.png?apikey=' + ThunderForest_ApiKey, 0, 19, 3, nil, nil, nil, nil);