pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

LazMapViewer: Fix compilation with Laz 1.8.4

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7333 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2020-03-20 14:51:20 +00:00
parent 35dfdbdf7a
commit 2ba2c46cf2
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
components/lazmapviewer/source/mvde_intfgraphics.pas
View File

@ -5,7 +5,7 @@ unit mvDE_IntfGraphics;
interface interface
uses uses
Classes, SysUtils, Graphics, Types, LazVersion, Classes, SysUtils, Graphics, Types, LclVersion,
FPImage, FPCanvas, IntfGraphics, FPImage, FPCanvas, IntfGraphics,
mvDrawingEngine; mvDrawingEngine;
@ -65,7 +65,14 @@ begin
Result := (x >= min) and (x <= max); Result := (x >= min) and (x <= max);
end; end;
{$IF Laz_FullVersion < 1090000}
{$IF Lcl_FullVersion < 1090000}
function IfThen(ACondition: Boolean; a, b: Integer): Integer;
begin
if ACondition then Result := a else Result := b;
end;
// Workaround for http://mantis.freepascal.org/view.php?id=27144 // Workaround for http://mantis.freepascal.org/view.php?id=27144
procedure CopyPixels(ASource, ADest: TLazIntfImage; procedure CopyPixels(ASource, ADest: TLazIntfImage;
XDst: Integer = 0; YDst: Integer = 0; XDst: Integer = 0; YDst: Integer = 0;
@ -117,9 +124,12 @@ begin
ADest.Masked[x+XDst,y+YDst] := True; ADest.Masked[x+XDst,y+YDst] := True;
end; end;
end; end;
{$IFEND} {$IFEND}
{ TMvIntfGraphicsDrawingengine }
destructor TMvIntfGraphicsDrawingEngine.Destroy; destructor TMvIntfGraphicsDrawingEngine.Destroy;
begin begin
FCanvas.Free; FCanvas.Free;
@ -192,9 +202,9 @@ end;
procedure TMvIntfGraphicsDrawingEngine.DrawLazIntfImage(X, Y: Integer; procedure TMvIntfGraphicsDrawingEngine.DrawLazIntfImage(X, Y: Integer;
AImg: TLazIntfImage); AImg: TLazIntfImage);
begin begin
{$IF Laz_FullVersion < 1090000} {$IF Lcl_FullVersion < 1090000}
{ Workaround for //http://mantis.freepascal.org/view.php?id=27144 } { Workaround for //http://mantis.freepascal.org/view.php?id=27144 }
CopyPixels(AImg, Buffer, X, Y); CopyPixels(AImg, FBuffer, X, Y);
{$ELSE} {$ELSE}
FBuffer.CopyPixels(AImg, X, Y); FBuffer.CopyPixels(AImg, X, Y);
{$IFEND} {$IFEND}