paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-11 15:56:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL: added default conversion for unix function using iconv, from Whitewind, bug #11203

Browse Source 
git-svn-id: trunk@15866 -
This commit is contained in:
mattias 2008-07-25 15:53:41 +00:00
parent 5f699ac8b2
commit c2b2c2b47a
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lcl/lconvencoding.pas
View File

@ -27,7 +27,7 @@ interface
uses
SysUtils, Classes, dos, LCLProc
{$IFDEF UNIX},unix{$ENDIF};
{$IFDEF UNIX},{$IFDEF VER2_3}iconvenc{$ELSE}unix{$ENDIF}{$ENDIF};
{$inline on}
@ -4538,9 +4538,13 @@ var
AFrom, ATo, SysEnc : String;
Encoded : Boolean;
{$ifdef Unix}
{$ifdef VER2_3}
Dummy: String;
{$else}
SL: TStringList;
FN1, FN2: String;
{$endif}
{$endif}
begin
AFrom:=NormalizeEncoding(FromEncoding);
ATo:=NormalizeEncoding(ToEncoding);
@ -4723,11 +4727,22 @@ begin
end;
//Stupid code. Works anyway, but extra-slow
Result:=s;
{$ifdef Unix}
DebugLn(['CPConvert NOTE: using slow iconv workaround to convert from ',AFrom,' to ',ATo]);
try
{$ifdef VER2_3}
if not IconvLibFound and not InitIconv(Dummy) then
begin
DebugLn(['Can not init iconv: ',Dummy]);
Exit;
end;
if Iconvert(s, Result, AFrom, ATo)<>0 then
begin
Result:=s;
Exit;
end;
{$else}
DebugLn(['CPConvert NOTE: using slow iconv workaround to convert from ',AFrom,' to ',ATo]);
SL:=TStringList.Create;
SL.Text:=s;
FN1:=GetTempFileName;
@ -4739,6 +4754,7 @@ begin
Result:=SL.Text;
DeleteFile(FN1);
DeleteFile(FN2);
{$endif}
except
end;
{$endif}