1 --- ./gfx/src/freetype/nsFreeType.h.orig 2004-07-24 01:50:37.000000000 +0200
2 +++ ./gfx/src/freetype/nsFreeType.h 2004-07-24 01:53:33.000000000 +0200
4 typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*);
5 typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap charmap);
6 typedef FT_Error (*FTC_Image_Cache_Lookup_t)
7 - (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*);
8 -typedef FT_Error (*FTC_Manager_Lookup_Size_t)
9 - (FTC_Manager, FTC_Font, FT_Face*, FT_Size*);
10 + (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*);
11 +typedef FT_Error (*FTC_Manager_LookupFace_t)
12 + (FTC_Manager, FTC_FaceID, FT_Face*);
13 typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager);
14 typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong,
15 FTC_Face_Requester, FT_Pointer, FTC_Manager*);
16 -typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*);
17 +typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*);
19 typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*);
20 typedef FT_Error (*FT_Get_Kerning_t)
22 FT_Outline_Decompose_t nsFT_Outline_Decompose;
23 FT_Set_Charmap_t nsFT_Set_Charmap;
24 FTC_Image_Cache_Lookup_t nsFTC_Image_Cache_Lookup;
25 - FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size;
26 + FTC_Manager_LookupFace_t nsFTC_Manager_LookupFace;
27 FTC_Manager_Done_t nsFTC_Manager_Done;
28 FTC_Manager_New_t nsFTC_Manager_New;
29 FTC_Image_Cache_New_t nsFTC_Image_Cache_New;
31 PRLibrary *mSharedLib;
32 FT_Library mFreeTypeLibrary;
33 FTC_Manager mFTCacheManager;
34 - FTC_Image_Cache mImageCache;
35 + FTC_ImageCache mImageCache;
37 static nsHashtable *sFontFamilies;
38 static nsHashtable *sRange1CharSetNames;