i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change FT cache manager calls to conform to the new FreeType 2.1.8 API

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10595 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
haydentech
2005-01-06 18:29:02 +00:00
parent 110351f212
commit e25d0ac8e6
2 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/servers/app/FontFamily.h
+3 -6
View File
@@ -120,15 +120,12 @@ public:
const char *Name(void);
FontFamily *Family(void) { return family; }
// TODO: Re-enable when I understand how the FT2 Cache system changed from
// 2.1.4 to 2.1.8
// FT_Face GetFace(void);
FT_Face GetFace(void);
const char *GetPath(void);
// TODO: Re-enable when I understand how the FT2 Cache system changed from
// 2.1.4 to 2.1.8
// int16 ConvertToUnicode(uint16 c);
int16 ConvertToUnicode(uint16 c);
protected:
friend class FontFamily;
FontFamily *family;
src/servers/app/server/FontFamily.cpp
+2 -12
View File
@@ -96,16 +96,11 @@ const char *FontStyle::Name(void)
\brief Returns a handle to the style in question, straight from FreeType's cache
\return FreeType face handle or NULL if there was an internal error
*/
// TODO: Re-enable when I understand how the FT2 Cache system changed from
// 2.1.4 to 2.1.8
/*
FT_Face FontStyle::GetFace(void)
{
FT_Face f;
return (FTC_Manager_Lookup_Face(ftmanager,cachedface,&f)!=0)?f:NULL;
return (FTC_Manager_LookupFace(ftmanager,(FTC_FaceID)cachedface,&f)!=0)?f:NULL;
}
*/
/*!
\brief Returns the path to the style's font file
@@ -121,19 +116,14 @@ const char *FontStyle::GetPath(void)
\param c An ASCII character
\return A Unicode value for the character
*/
// TODO: Re-enable when I understand how the FT2 Cache system changed from
// 2.1.4 to 2.1.8
/*
int16 FontStyle::ConvertToUnicode(uint16 c)
{
FT_Face f;
if(FTC_Manager_Lookup_Face(ftmanager,cachedface,&f)!=0)
if(FTC_Manager_LookupFace(ftmanager,(FTC_FaceID)cachedface,&f)!=0)
return 0;
return FT_Get_Char_Index(f,c);
}
*/
/*!
\brief Creates a new ServerFont object for the style, given size, shear, and rotation.