From e2769e7d4307654602c2ce2c1f5b19d65e710556 Mon Sep 17 00:00:00 2001 From: fgsfds Date: Sat, 10 Apr 2021 21:42:10 +0300 Subject: [PATCH] FPC3.2.0 compat patch by deaddoomer --- src/lib/vampimg/ImagingPcx.pas | 4 ---- src/lib/vampimg/ImagingTypes.pas | 6 +++++- src/shared/MAPDEF.pas | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib/vampimg/ImagingPcx.pas b/src/lib/vampimg/ImagingPcx.pas index d278542..9379b8b 100644 --- a/src/lib/vampimg/ImagingPcx.pas +++ b/src/lib/vampimg/ImagingPcx.pas @@ -87,10 +87,6 @@ end; function TPCXFileFormat.LoadData(Handle: TImagingHandle; var Images: TDynImageDataArray; OnlyFirstLevel: Boolean): Boolean; -const - ifMono: TImageFormat = TImageFormat(250); - ifIndex2: TImageFormat = TImageFormat(251); - ifIndex4: TImageFormat = TImageFormat(252); var Hdr: TPCXHeader; PalID, B: Byte; diff --git a/src/lib/vampimg/ImagingTypes.pas b/src/lib/vampimg/ImagingTypes.pas index 9c5e1f1..add9ca6 100644 --- a/src/lib/vampimg/ImagingTypes.pas +++ b/src/lib/vampimg/ImagingTypes.pas @@ -251,7 +251,7 @@ type ifBTC = 203, ifATI1N = 204, ifATI2N = 205, - ifBinary = 206 + ifBinary = 206, { Passtrough formats } {ifETC1 = 220, ifETC2RGB = 221, @@ -259,6 +259,10 @@ type ifETC2PA = 223, ifDXBC6 = 224, ifDXBC7 = 225} + { PCX formats } + ifMono = 250, + ifIndex2 = 251, + ifIndex4 = 252 ); { Color value for 32 bit images.} diff --git a/src/shared/MAPDEF.pas b/src/shared/MAPDEF.pas index ceedbe3..5316d01 100644 --- a/src/shared/MAPDEF.pas +++ b/src/shared/MAPDEF.pas @@ -144,7 +144,7 @@ type //function Direction (): Byte; inline; // direction, ubyte // trigger - function trigRec (): TDynRecord; inline; + function trigRec (): TDynRecord; {inline;} function Enabled (): Boolean; inline; // enabled, bool function TriggerType (): Byte; inline; // type, ubyte function ActivateType (): Byte; inline; // activatetype, ubyte @@ -350,7 +350,7 @@ end; // ////////////////////////////////////////////////////////////////////////// // // trigger -function TDynRecordHelper.trigRec (): TDynRecord; inline; +function TDynRecordHelper.trigRec (): TDynRecord; {inline;} var fld: TDynField; begin -- 2.29.2