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

* freetype windows compat patch from Pascal Riekenberg, mantis #35644

Browse Source 
git-svn-id: trunk@42144 -
This commit is contained in:
marco 2019-05-31 09:41:28 +00:00
parent 6d65a8f1e3
commit 455cb6758f
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,7 @@ uses sysutils, classes, {$IFDEF DYNAMIC}freetypehdyn{$ELSE}freetypeh{$ENDIF}, FP
fontfiles and faces available in a fontfile } fontfiles and faces available in a fontfile }
// determine if file comparison need to be case sensitive or not // determine if file comparison need to be case sensitive or not
{$ifdef WIN32} {$ifdef windows}
{$undef CaseSense} {$undef CaseSense}
{$else} {$else}
{$define CaseSense} {$define CaseSense}
@ -200,8 +200,6 @@ const
implementation implementation
{$IFDEF win32}uses dos;{$ENDIF}
procedure FTError (Event:string; Err:integer); procedure FTError (Event:string; Err:integer);
begin begin
raise FreeTypeException.CreateFmt (sErrFreeType, [Err,Event]); raise FreeTypeException.CreateFmt (sErrFreeType, [Err,Event]);
@ -1032,15 +1030,15 @@ begin
aRect := FBounds; aRect := FBounds;
end; end;
{$ifdef win32} {$ifdef WINDOWS}
procedure SetWindowsFontPath; procedure SetWindowsFontPath;
begin begin
DefaultSearchPath := includetrailingbackslash(GetEnv('windir')) + 'fonts'; DefaultSearchPath := includetrailingbackslash(GetEnvironmentVariable('windir')) + 'fonts';
end; end;
{$endif} {$endif}
initialization initialization
{$ifdef win32} {$ifdef WINDOWS}
SetWindowsFontPath; SetWindowsFontPath;
{$endif} {$endif}
end. end.

2
packages/fcl-image/src/libfreetype.inc
View File

@ -6,7 +6,7 @@ Const
// Windows // Windows
{$ifdef windows} {$ifdef windows}
FreeTypeDLL = 'freetype-6.dll'; // version 2.1.4 FreeTypeDLL = 'freetype.dll';
{$define ft_found_platform} {$define ft_found_platform}
{$endif} {$endif}