paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-06 04:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

* * commit convertfrom/to fixes from bug #39764 and #39765

Browse Source
This commit is contained in:
marcoonthegit 2022-06-06 17:19:49 +02:00
parent 51ab0d759f
commit 18c0a0eebe
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/rtl-objpas/src/inc/convutil.inc
View File

@ -45,6 +45,7 @@ function Convert ( const Measurement : Double; const FromType, ToType : TConvT
function Convert ( const Measurement : Double; const FromType1, FromType2, ToType1, ToType2 : TConvType ) :TConvUtilFloat;
function ConvertFrom(const AFrom: TConvType; AValue: Double): TConvUtilFloat;
function ConvertTo(const AValue: Double; const ATo: TConvType): TConvUtilFloat;
function ConvFamilyToDescription(const AFamily: TConvFamily): string;
function ConvTypeToDescription(const AType: TConvType): string;
@ -350,7 +351,24 @@ var
begin
if not SearchConvert(AFrom, fromrec) then
raise EConversionError.CreateFmt(SConvUnknownType, [IntToStr(AFrom)]);
result:=fromrec.value*AValue;
if Assigned(fromrec.ToCommonFunc) then
result:=fromrec.ToCommonFunc(AValue)
else
result:=fromrec.value*AValue;
end;
function ConvertTo(const AValue: Double; const ATo: TConvType): TConvUtilFloat;
var
torec : resourcedata;
begin
if not SearchConvert(ATo, torec) then
raise EConversionError.CreateFmt(SConvUnknownType, [IntToStr(ATo)]);
if Assigned(torec.FromCommonFunc) then
result:=torec.FromCommonFunc(AValue)
else
result:=Avalue/torec.value;
end;
Constructor TConvTypeInfo.Create(Const AConvFamily : TConvFamily;const ADescription:String);