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

fpspreadsheet: Fix compilation issue due to stupid 64-bit fpc not being able to pick correct overload of MinValue. Less hints on 64 bit.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7556 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz 2020-07-22 17:55:17 +00:00
parent 901b92fa72
commit 64b69c2893
12 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/fpspreadsheet/laz_fpspreadsheet.lpk
View File

@ -19,7 +19,7 @@
</Parsing>
<Other>
<CompilerMessages>
<IgnoredMessages idx5028="True" idx4055="True" idx2005="True"/>
<IgnoredMessages idx6058="True" idx5028="True" idx4055="True" idx2005="True"/>
</CompilerMessages>
<CustomOptions Value="$(IDEBuildOptions)
-dDisableWrapperFunctions"/>

2
components/fpspreadsheet/source/common/fpscell.pas
View File

@ -2,7 +2,7 @@ unit fpsCell;
{$mode objfpc}{$H+}
{$modeswitch advancedrecords}
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
interface
uses

2
components/fpspreadsheet/source/common/fpsconditionalformat.pas
View File

@ -1,7 +1,7 @@
unit fpsConditionalFormat;
{$mode objfpc}{$H+}
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
interface
uses

2
components/fpspreadsheet/source/common/fpsfunc.pas
View File

@ -5,7 +5,7 @@
unit fpsfunc;
{$mode objfpc}{$H+}
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
interface
uses

8
components/fpspreadsheet/source/common/fpsopendocument.pas
View File

@ -28,7 +28,7 @@ unit fpsOpenDocument;
{$ifdef fpc}
{$mode objfpc}{$H+}
{$endif}
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
{$I ..\fps.inc}
interface
@ -3985,7 +3985,8 @@ begin
ANode := ANode.NextSibling;
end;
n := MinValue([Length(values), Length(kinds), Length(colors)]);
n := MinValue([Integer(Length(values)), Integer(Length(kinds)), Integer(Length(colors))]);
// Cast needed due to stupid 64-bit FPC not knowing which overload to select ...
case n of
0,
1: exit;
@ -4058,7 +4059,8 @@ begin
if (posColor = scNotDefined) and (negColor <> scNotDefined) then
posColor := negColor;
n := MaxValue([Length(values), Length(kinds)]);
n := MinValue([Integer(Length(values)), Integer(Length(kinds))]);
// Cast needed due to stupid 64-bit FPC not knowing which overload to select...
if n < 2 then
exit;

2
components/fpspreadsheet/source/common/fpspagelayout.pas
View File

@ -1,7 +1,7 @@
unit fpsPageLayout;
{$mode objfpc}{$H+}
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
interface
uses

2
components/fpspreadsheet/source/common/fpspreadsheet.pas
View File

@ -13,7 +13,7 @@ unit fpSpreadsheet;
{$mode delphi}{$H+}
// {$mode objpas}{$H+}
{$endif}
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
{$include ..\fps.inc}
interface

10
components/fpspreadsheet/source/common/fpsutils.pas
View File

@ -2975,8 +2975,8 @@ begin
// chromatic case
// saturation
if L <= 128
then S := integer(diff * 255) div (cMax + cMin)
else S := integer(diff * 255) div (510 - cMax - cMin);
then S := (diff * 255) div (cMax + cMin)
else S := (diff * 255) div (510 - cMax - cMin);
// hue
Rdelta := (cMax - R);
@ -2984,10 +2984,10 @@ begin
Bdelta := (cMax - B);
if R = cMax
then H := (HUE_000 + integer(Bdelta - Gdelta) * HUE_060 div diff) and $ff
then H := (HUE_000 + (Bdelta - Gdelta) * HUE_060 div diff) and $ff
else if G = cMax
then H := HUE_120 + integer(Rdelta - Bdelta) * HUE_060 div diff
else H := HUE_240 + integer(Gdelta - Rdelta) * HUE_060 div diff;
then H := HUE_120 + (Rdelta - Bdelta) * HUE_060 div diff
else H := HUE_240 + (Gdelta - Rdelta) * HUE_060 div diff;
end;
end;

2
components/fpspreadsheet/source/common/uvirtuallayer_ole_helpers.pas
View File

@ -15,7 +15,7 @@ AUTHORS: José Mejuto Porral
unit uvirtuallayer_ole_helpers;
{$mode objfpc}{$H+}
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
interface
uses

2
components/fpspreadsheet/source/common/xlscommon.pas
View File

@ -6,7 +6,7 @@ OpenOffice Microsoft Excel File Format document }
{$ifdef fpc}
{$mode objfpc}{$H+}
{$endif}
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
{$I fps.inc}
interface

2
components/fpspreadsheet/source/common/xlsxml.pas
View File

@ -17,7 +17,7 @@ unit xlsxml;
{$ifdef fpc}
{$mode objfpc}{$H+}
{$endif}
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
interface
uses

2
components/fpspreadsheet/source/common/xlsxooxml.pas
View File

@ -30,7 +30,7 @@ unit xlsxooxml;
{$ifdef fpc}
{$mode objfpc}{$H+}
{$endif}
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
interface
uses