1e320db38d
the community-driven continuation of the Mozilla Suite, which is no longer maintained by Mozilla.
61 lines
2.8 KiB
Text
61 lines
2.8 KiB
Text
$NetBSD: patch-ak,v 1.1.1.1 2006/03/30 19:15:48 ghen Exp $
|
|
|
|
--- gfx/src/freetype/nsFreeType.cpp.orig 2005-07-13 20:21:10.000000000 +0200
|
|
+++ gfx/src/freetype/nsFreeType.cpp
|
|
@@ -110,11 +110,11 @@ FtFuncList nsFreeType2::FtFuncs [] = {
|
|
{"FT_New_Face", NS_FT2_OFFSET(nsFT_New_Face), PR_TRUE},
|
|
{"FT_Outline_Decompose", NS_FT2_OFFSET(nsFT_Outline_Decompose), PR_TRUE},
|
|
{"FT_Set_Charmap", NS_FT2_OFFSET(nsFT_Set_Charmap), PR_TRUE},
|
|
- {"FTC_Image_Cache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE},
|
|
- {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE},
|
|
+ {"FTC_ImageCache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE},
|
|
+ {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace), PR_TRUE},
|
|
{"FTC_Manager_Done", NS_FT2_OFFSET(nsFTC_Manager_Done), PR_TRUE},
|
|
{"FTC_Manager_New", NS_FT2_OFFSET(nsFTC_Manager_New), PR_TRUE},
|
|
- {"FTC_Image_Cache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE},
|
|
+ {"FTC_ImageCache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE},
|
|
// #ifdef MOZ_SVG
|
|
{"FT_Glyph_Transform", NS_FT2_OFFSET(nsFT_Glyph_Transform), PR_TRUE},
|
|
{"FT_Get_Kerning", NS_FT2_OFFSET(nsFT_Get_Kerning), PR_TRUE},
|
|
@@ -288,7 +288,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
-nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc,
|
|
+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc,
|
|
FT_UInt glyphID, FT_Glyph *glyph)
|
|
{
|
|
// call the FreeType2 function via the function pointer
|
|
@@ -297,11 +297,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
-nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font,
|
|
- FT_Face *face, FT_Size *size)
|
|
+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id,
|
|
+ FT_Face *face)
|
|
{
|
|
// call the FreeType2 function via the function pointer
|
|
- FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size);
|
|
+ FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face);
|
|
return error ? NS_ERROR_FAILURE : NS_OK;
|
|
}
|
|
|
|
@@ -326,7 +326,7 @@ nsFreeType2::ManagerNew(FT_Library libra
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
-nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache)
|
|
+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache)
|
|
{
|
|
// call the FreeType2 function via the function pointer
|
|
FT_Error error = nsFTC_Image_Cache_New(manager, cache);
|
|
@@ -395,7 +395,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
-nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
|
|
+nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
|
|
{
|
|
*aCache = mImageCache;
|
|
return NS_OK;
|