40 lines
2 KiB
Text
40 lines
2 KiB
Text
$NetBSD: patch-aj,v 1.2 2013/03/24 16:45:55 joerg Exp $
|
|
|
|
--- gfx/src/freetype/nsFreeType.h.orig 2004-04-16 21:31:42.000000000 +0000
|
|
+++ gfx/src/freetype/nsFreeType.h
|
|
@@ -104,13 +104,13 @@ typedef FT_Error (*FT_Outline_Decompose_
|
|
typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*);
|
|
typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap charmap);
|
|
typedef FT_Error (*FTC_Image_Cache_Lookup_t)
|
|
- (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*);
|
|
-typedef FT_Error (*FTC_Manager_Lookup_Size_t)
|
|
- (FTC_Manager, FTC_Font, FT_Face*, FT_Size*);
|
|
+ (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*);
|
|
+typedef FT_Error (*FTC_Manager_LookupFace_t)
|
|
+ (FTC_Manager, FTC_FaceID, FT_Face*);
|
|
typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager);
|
|
typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong,
|
|
FTC_Face_Requester, FT_Pointer, FTC_Manager*);
|
|
-typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*);
|
|
+typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*);
|
|
// #ifdef MOZ_SVG
|
|
typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*);
|
|
typedef FT_Error (*FT_Get_Kerning_t)
|
|
@@ -165,7 +165,7 @@ protected:
|
|
FT_Outline_Decompose_t nsFT_Outline_Decompose;
|
|
FT_Set_Charmap_t nsFT_Set_Charmap;
|
|
FTC_Image_Cache_Lookup_t nsFTC_Image_Cache_Lookup;
|
|
- FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size;
|
|
+ FTC_Manager_LookupFace_t nsFTC_Manager_LookupFace;
|
|
FTC_Manager_Done_t nsFTC_Manager_Done;
|
|
FTC_Manager_New_t nsFTC_Manager_New;
|
|
FTC_Image_Cache_New_t nsFTC_Image_Cache_New;
|
|
@@ -213,7 +213,7 @@ protected:
|
|
PRLibrary *mSharedLib;
|
|
FT_Library mFreeTypeLibrary;
|
|
FTC_Manager mFTCacheManager;
|
|
- FTC_Image_Cache mImageCache;
|
|
+ FTC_ImageCache mImageCache;
|
|
|
|
static nsHashtable *sFontFamilies;
|
|
static nsHashtable *sRange1CharSetNames;
|