packages/x11/firefox/freetype2.patch

   1 --- ./gfx/src/freetype/nsFreeType.cpp.orig      2004-07-21 19:32:11.000000000 +0200
   2 +++ ./gfx/src/freetype/nsFreeType.cpp   2004-07-21 19:36:36.000000000 +0200
   3 @@ -110,11 +110,11 @@
   4    {"FT_New_Face",             NS_FT2_OFFSET(nsFT_New_Face),             PR_TRUE},
   5    {"FT_Outline_Decompose",    NS_FT2_OFFSET(nsFT_Outline_Decompose),    PR_TRUE},
   6    {"FT_Set_Charmap",          NS_FT2_OFFSET(nsFT_Set_Charmap),          PR_TRUE},
   7 -  {"FTC_Image_Cache_Lookup",  NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),  PR_TRUE},
   8 -  {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE},
   9 +  {"FTC_ImageCache_Lookup",  NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),  PR_TRUE},
  10 +  {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace), PR_TRUE},
  11    {"FTC_Manager_Done",        NS_FT2_OFFSET(nsFTC_Manager_Done),        PR_TRUE},
  12    {"FTC_Manager_New",         NS_FT2_OFFSET(nsFTC_Manager_New),         PR_TRUE},
  13 -  {"FTC_Image_Cache_New",     NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
  14 +  {"FTC_ImageCache_New",     NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
  15  // #ifdef MOZ_SVG
  16    {"FT_Glyph_Transform",      NS_FT2_OFFSET(nsFT_Glyph_Transform),      PR_TRUE},
  17    {"FT_Get_Kerning",          NS_FT2_OFFSET(nsFT_Get_Kerning),          PR_TRUE},
  18 @@ -291,11 +291,11 @@
  19  }
  20
  21  NS_IMETHODIMP
  22 -nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font,
  23 -                               FT_Face *face, FT_Size *size)
  24 +nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id,
  25 +                               FT_Face *face)
  26  {
  27    // call the FreeType2 function via the function pointer
  28 -  FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size);
  29 +  FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face);
  30    return error ? NS_ERROR_FAILURE : NS_OK;
  31  }
  32
  33 @@ -320,7 +320,7 @@
  34  }
  35
  36  NS_IMETHODIMP
  37 -nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache)
  38 +nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache)
  39  {
  40    // call the FreeType2 function via the function pointer
  41    FT_Error error = nsFTC_Image_Cache_New(manager, cache);
  42 @@ -389,7 +389,7 @@
  43  }
  44
  45  NS_IMETHODIMP
  46 -nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
  47 +nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
  48  {
  49    *aCache = mImageCache;
  50    return NS_OK;