Re: [fpc-devel] Small fixes to softfpu.pp complementing r27215

2016-06-05 Thread Florian Klämpfl 
Am 05.06.2016 um 15:54 schrieb Max Nazhalov:
> These are fix compiling softfpu with FPC_SOFTFLOAT_FLOATX80 and
> FPC_SOFTFLOAT_FLOAT128 enabled.
> 

Thanks, applied.
___
fpc-devel maillist  -  fpc-devel@lists.freepascal.org
http://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel

[fpc-devel] Small fixes to softfpu.pp complementing r27215

2016-06-05 Thread Max Nazhalov 
These are fix compiling softfpu with FPC_SOFTFLOAT_FLOATX80 and
FPC_SOFTFLOAT_FLOAT128 enabled.

-- 
WBR, Max

Index: rtl/inc/softfpu.pp
===
--- rtl/inc/softfpu.pp  (revision 33913)
+++ rtl/inc/softfpu.pp  (working copy)
@@ -6227,7 +6227,7 @@
 
 function roundAndPackFloatx80(roundingPrecision: int8; zSign: flag; zExp: 
int32; zSig0: bits64; zSig1: bits64): floatx80;
 var
-roundingMode: int8;
+roundingMode: TFPURoundingMode;
 roundNearestEven, increment, isTiny: flag;
 roundIncrement, roundMask, roundBits: int64;
 label
@@ -6786,7 +6786,7 @@
 aSign: flag;
 aExp: int32;
 lastBitMask, roundBitsMask: bits64;
-roundingMode: int8;
+roundingMode: TFPURoundingMode;
 z: floatx80;
 begin
 aExp := extractFloatx80Exp( a );
@@ -7751,7 +7751,7 @@
 
 function roundAndPackFloat128(zSign: flag; zExp: int32; zSig0: bits64; zSig1: 
bits64; zSig2: bits64): float128;
 var
-roundingMode: int8;
+roundingMode: TFPURoundingMode;
 roundNearestEven, increment, isTiny: flag;
 begin
 roundingMode := softfloat_rounding_mode;
@@ -8238,7 +8238,7 @@
 aSign: flag;
 aExp: int32;
 lastBitMask, roundBitsMask: bits64;
-roundingMode: int8;
+roundingMode: TFPURoundingMode;
 z: float128;
 begin
 aExp := extractFloat128Exp( a );


___
fpc-devel maillist  -  fpc-devel@lists.freepascal.org
http://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel

[fpc-devel] Small fixes

2006-01-08 Thread C Western 

Attached are two small patches to fix:

1. TFPWriterXPM fails if there are more than 60 or so colours in the palette

2. Warnings when using ReadXMLFile

Colin
diff -uNr trunk/fpcsrc/fcl/xml/xmlread.pp trunk.w/fpcsrc/fcl/xml/xmlread.pp
--- trunk/fpcsrc/fcl/xml/xmlread.pp	2005-10-19 23:04:44.0 +0100
+++ trunk.w/fpcsrc/fcl/xml/xmlread.pp	2006-01-08 17:49:48.0 +
@@ -31,10 +31,10 @@
   EXMLReadError = class(Exception);
 
 
-procedure ReadXMLFile(var ADoc: TXMLDocument; const AFilename: String); overload;
-procedure ReadXMLFile(var ADoc: TXMLDocument; var f: File); overload;
-procedure ReadXMLFile(var ADoc: TXMLDocument; var f: TStream); overload;
-procedure ReadXMLFile(var ADoc: TXMLDocument; var f: TStream; const AFilename: String); overload;
+procedure ReadXMLFile(out ADoc: TXMLDocument; const AFilename: String); overload;
+procedure ReadXMLFile(out ADoc: TXMLDocument; var f: File); overload;
+procedure ReadXMLFile(out ADoc: TXMLDocument; var f: TStream); overload;
+procedure ReadXMLFile(out ADoc: TXMLDocument; var f: TStream; const AFilename: String); overload;
 
 procedure ReadXMLFragment(AParentNode: TDOMNode; const AFilename: String); overload;
 procedure ReadXMLFragment(AParentNode: TDOMNode; var f: File); overload;
@@ -1346,7 +1346,7 @@
 
 
 
-procedure ReadXMLFile(var ADoc: TXMLDocument; var f: File);
+procedure ReadXMLFile(out ADoc: TXMLDocument; var f: File);
 var
   reader: TXMLReader;
   buf: PChar;
@@ -1373,7 +1373,7 @@
   end;
 end;
 
-procedure ReadXMLFile(var ADoc: TXMLDocument; var f: TStream; const AFilename: String);
+procedure ReadXMLFile(out ADoc: TXMLDocument; var f: TStream; const AFilename: String);
 var
   reader: TXMLReader;
   buf: PChar;
@@ -1397,12 +1397,12 @@
   end;
 end;
 
-procedure ReadXMLFile(var ADoc: TXMLDocument; var f: TStream);
+procedure ReadXMLFile(out ADoc: TXMLDocument; var f: TStream);
 begin
   ReadXMLFile(ADoc, f, 'Stream');
 end;
 
-procedure ReadXMLFile(var ADoc: TXMLDocument; const AFilename: String);
+procedure ReadXMLFile(out ADoc: TXMLDocument; const AFilename: String);
 var
   FileStream: TFileStream;
   MemStream: TMemoryStream;
diff -uNr trunk/fpcsrc/fcl/image/fpwritexpm.pp trunk.w/fpcsrc/fcl/image/fpwritexpm.pp
--- trunk/fpcsrc/fcl/image/fpwritexpm.pp	2005-06-11 09:58:32.0 +0100
+++ trunk.w/fpcsrc/fcl/image/fpwritexpm.pp	2006-01-08 18:32:15.0 +
@@ -85,12 +85,13 @@
   dec (charplace);
   while (r = e) and (c = 0) do
 begin
-if Charplace = 1 then
+if Charplace  0 then
   MakeCodes (head+PalChars[r],charplace)
-else
+else begin
   p.Add (head+PalChars[r]);
+  dec(c);
+end;
 inc (r);
-dec(c);
 end;
 end;
   begin
___
fpc-devel maillist  -  fpc-devel@lists.freepascal.org
http://lists.freepascal.org/mailman/listinfo/fpc-devel