FPC3.2.0 compat patch by deaddoomer

diff --git a/src/lib/vampimg/ImagingPcx.pas b/src/lib/vampimg/ImagingPcx.pas
index d278542ed188bf86b33f225f9d0595cd67d316fd..9379b8b84e312679a2d9818525dafef32d7cc021 100644 (file)
--- 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 9c5e1f13a0324d7c41a3004e595bb83e6d4177b7..add9ca6f8d62d8abdcb89c4c9c37cc9c9653e819 100644 (file)
--- 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 ceedbe3f5aaf6d36b6e98c9b011b2af261f25bc8..5316d010f6a7875df557254d7ea4df71b3d35136 100644 (file)
--- 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