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

* Fix typo

Browse Source
This commit is contained in:
Michaël Van Canneyt 2023-07-01 11:19:15 +02:00
parent c994b5efe8
commit 45d00abddc
1 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,7 @@ uses sysutils, classes, {$IFDEF DYNAMIC}freetypehdyn{$ELSE}freetypeh{$ENDIF}, FP
{ TODO : speed optimization: search glyphs with a hash-function/tree/binary search/... } { TODO : speed optimization: search glyphs with a hash-function/tree/binary search/... }
{ TODO : memory optimization: TStringBitmaps keeps for each differnet character { TODO : memory optimization: TStringBitmaps keeps for each differnet character
only 1 bitmap } only 1 bitmap }
{ TODO : load other files depending on the extention } { TODO : load other files depending on the extension }
{ possible TODO : different sizes/resolutions for x and y } { possible TODO : different sizes/resolutions for x and y }
{ possible TODO : TFontmanager can fill a list of all the fonts he can find { possible TODO : TFontmanager can fill a list of all the fonts he can find
fontfiles and faces available in a fontfile } fontfiles and faces available in a fontfile }
@ -114,7 +114,7 @@ type
FTLib : PFT_Library; FTLib : PFT_Library;
FList : TList; FList : TList;
FPaths : TStringList; FPaths : TStringList;
FExtention : string; FExtension : string;
FResolution : integer; FResolution : integer;
CurFont : TMgrFont; CurFont : TMgrFont;
CurSize : PMgrSize; CurSize : PMgrSize;
@ -122,7 +122,7 @@ type
UseKerning : boolean; UseKerning : boolean;
function GetSearchPath : string; function GetSearchPath : string;
procedure SetSearchPath (AValue : string); procedure SetSearchPath (AValue : string);
procedure SetExtention (AValue : string); procedure SetExtension (AValue : string);
Procedure DoMakeString (Text : Array of cardinal; ABitmaps : TBaseStringBitmaps); Procedure DoMakeString (Text : Array of cardinal; ABitmaps : TBaseStringBitmaps);
Procedure DoMakeString (Text : Array of cardinal; angle: real; ABitmaps : TBaseStringBitmaps); Procedure DoMakeString (Text : Array of cardinal; angle: real; ABitmaps : TBaseStringBitmaps);
protected protected
@ -160,42 +160,45 @@ type
function GetStringGray (FontId:integer; Text:Unicodestring; Size:real) : TUnicodeStringBitmaps; function GetStringGray (FontId:integer; Text:Unicodestring; Size:real) : TUnicodeStringBitmaps;
// Anti Aliased gray scale, following the direction of the font (left to right, top to bottom, ...) // Anti Aliased gray scale, following the direction of the font (left to right, top to bottom, ...)
property SearchPath : string read GetSearchPath write SetSearchPath; property SearchPath : string read GetSearchPath write SetSearchPath;
property DefaultExtention : string read FExtention write SetExtention; property DefaultExtension : string read FExtension write SetExtension;
property DefaultExtention : string read FExtension write SetExtension; deprecated 'Use DefaultExtension';
property Resolution : integer read Fresolution write FResolution; property Resolution : integer read Fresolution write FResolution;
end; end;
const Resourcestring
sErrErrorsInCleanup : string = '%d errors detected while freeing a Font Manager object'; sErrErrorsInCleanup = '%d errors detected while freeing a Font Manager object';
sErrFontFileNotFound : string = 'Font file "%s" not found'; sErrFontFileNotFound = 'Font file "%s" not found';
sErrFreeType : string = 'Error %d while %s'; sErrFreeType = 'Error %d while %s';
sInitializing : string = 'initializing font engine'; sInitializing = 'initializing font engine';
sDestroying : string = 'destroying font engine'; sDestroying = 'destroying font engine';
sErrErrorInCleanup : string = 'freeing Font Manager object'; sErrErrorInCleanup = 'freeing Font Manager object';
sErrSetPixelSize : string = 'setting pixel size %d (resolution %d)'; sErrSetPixelSize = 'setting pixel size %d (resolution %d)';
sErrSetCharSize : string = 'setting char size %d (resolution %d)'; sErrSetCharSize = 'setting char size %d (resolution %d)';
sErrLoadingGlyph : string = 'loading glyph'; sErrLoadingGlyph = 'loading glyph';
sErrKerning : string = 'determining kerning distance'; sErrKerning = 'determining kerning distance';
sErrMakingString1 : string = 'making string bitmaps step 1'; sErrMakingString1 = 'making string bitmaps step 1';
sErrMakingString2 : string = 'making string bitmaps step 2'; sErrMakingString2 = 'making string bitmaps step 2';
sErrMakingString3 : string = 'making string bitmaps step 3'; sErrMakingString3 = 'making string bitmaps step 3';
sErrMakingString4 : string = 'making string bitmaps step 4'; sErrMakingString4 = 'making string bitmaps step 4';
sErrLoadFont : string = 'loading font %d from file %s'; sErrLoadFont = 'loading font %d from file %s';
sErrInitializing : string = 'initializing FreeType'; sErrInitializing = 'initializing FreeType';
sErrDestroying : string = 'finalizing FreeType'; sErrDestroying = 'finalizing FreeType';
DefaultFontExtention : string = '.ttf'; Const
DefaultFontExtension = '.ttf';
DefaultFontExtention = DefaultFontExtension deprecated 'Use DefaultFontExtension';
// Standard location for fonts in the Operating System // Standard location for fonts in the Operating System
{$ifdef Darwin} {$ifdef Darwin}
DefaultSearchPath : string = '/Library/Fonts/'; DefaultSearchPath = '/Library/Fonts/';
{$else} {$else}
DefaultSearchPath : string = ''; DefaultSearchPath = '';
{$endif} {$endif}
{$IFDEF MAC} {$IFDEF MAC}
DefaultResolution : integer = 72; DefaultResolution = 72;
{$ELSE} {$ELSE}
DefaultResolution : integer = 96; DefaultResolution = 96;
{$ENDIF} {$ENDIF}
implementation implementation
@ -326,7 +329,7 @@ begin
FTError (sErrInitializing, r); FTError (sErrInitializing, r);
end; end;
SearchPath := DefaultSearchPath; SearchPath := DefaultSearchPath;
DefaultExtention := DefaultFontExtention; DefaultExtension := DefaultFontExtension;
Resolution := DefaultResolution; Resolution := DefaultResolution;
end; end;
@ -394,13 +397,13 @@ begin
end; end;
end; end;
procedure TFontManager.SetExtention (AValue : string); procedure TFontManager.SetExtension (AValue : string);
begin begin
if AValue <> '' then if AValue <> '' then
if AValue[1] <> '.' then if AValue[1] <> '.' then
FExtention := '.' + AValue FExtension := '.' + AValue
else else
FExtention := AValue; FExtension := AValue;
end; end;
function TFontManager.SearchFont (afilename:string; doraise : boolean = true) : string; function TFontManager.SearchFont (afilename:string; doraise : boolean = true) : string;
@ -409,8 +412,8 @@ var p,fn : string;
r : integer; r : integer;
begin begin
Result:=''; Result:='';
if (pos('.', afilename)=0) and (DefaultFontExtention<>'') then if (pos('.', afilename)=0) and (DefaultFontExtension<>'') then
fn := afilename + DefaultFontExtention fn := afilename + DefaultFontExtension
else else
fn := aFilename; fn := aFilename;
if FileExists(fn) then if FileExists(fn) then