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

* freetype (ansi)string rendering: use automatic FPC conversion from current ANSI codepage

Browse Source 
git-svn-id: trunk@43290 -
This commit is contained in:
ondrej 2019-10-21 15:06:15 +00:00
parent cb9f569906
commit a4bfa27639
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/fcl-image/src/freetype.pp
View File

@ -598,16 +598,18 @@ function TFontManager.MakeString (FontId:integer; Text:string; size:integer; ang
Var Var
T : Array of cardinal; T : Array of cardinal;
C,I : Integer; C,I : Integer;
U: UnicodeString;
begin begin
CurFont := GetFont(FontID); CurFont := GetFont(FontID);
InitMakeString (FontID, Size); InitMakeString (FontID, Size);
c := length(text); U := UnicodeString(Text);
c := length(U);
result := TStringBitmaps.Create(c); result := TStringBitmaps.Create(c);
result.FText := Text; result.FText := Text;
SetLength(T,Length(Text)); SetLength(T,c);
For I:=1 to Length(Text) do For I:=1 to c do
T[I-1]:=Ord(Text[i]); T[I-1]:=Ord(U[i]);
DoMakeString(T,Angle,Result); DoMakeString(T,Angle,Result);
end; end;
@ -741,16 +743,18 @@ function TFontManager.MakeString (FontId:integer; Text:string; Size:integer) : T
Var Var
T : Array of Cardinal; T : Array of Cardinal;
C,I : Integer; C,I : Integer;
U : UnicodeString;
begin begin
CurFont := GetFont(FontID); CurFont := GetFont(FontID);
InitMakeString (FontID, Size); InitMakeString (FontID, Size);
c := length(text); U := UnicodeString(Text);
c := length(U);
result := TStringBitmaps.Create(c); result := TStringBitmaps.Create(c);
result.FText := Text; result.FText := Text;
SetLength(T,Length(Text)); SetLength(T,c);
For I:=1 to Length(Text) do For I:=1 to c do
T[I-1]:=Ord(Text[i]); T[I-1]:=Ord(U[i]);
DoMakeString(T,Result); DoMakeString(T,Result);
end; end;