nvu/patches/nvu-0.50-freetype-compile.patch

diff -ru ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h ./extensions/transformiix/source/base/ErrorObserver.h
--- ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h 2003-01-17 21:39:36.000000000 +0900
+++ ./extensions/transformiix/source/base/ErrorObserver.h   2004-06-10 22:56:01.000000000 +0900
@@ -28,7 +28,8 @@
 
 #include "baseutils.h"
 #include "txError.h"
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 class nsAString;
 
 /**
diff -ru ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl
--- ../Orig/mozilla/gfx/idl/nsIFreeType2.idl    2004-04-16 10:09:33.000000000 +0900
+++ ./gfx/idl/nsIFreeType2.idl  2004-06-11 00:32:42.000000000 +0900
@@ -76,10 +76,11 @@
 native FT_Sfnt_Tag(FT_Sfnt_Tag);
 native FT_Size(FT_Size);
 
-[ptr] native FTC_Image_Desc_p(FTC_Image_Desc);
+[ptr] native FTC_ImageType_p(FTC_ImageType);
 native FTC_Face_Requester(FTC_Face_Requester);
 native FTC_Font(FTC_Font);
-native FTC_Image_Cache(FTC_Image_Cache);
+native FTC_FaceID(FTC_FaceID);
+native FTC_ImageCache(FTC_ImageCache);
 native FTC_Manager(FTC_Manager);
 
 // #ifdef MOZ_SVG
@@ -99,7 +100,7 @@
 
     readonly attribute FT_Library library;
     readonly attribute FTC_Manager FTCacheManager;
-    readonly attribute FTC_Image_Cache ImageCache;
+    readonly attribute FTC_ImageCache ImageCache;
 
     void    doneFace(in FT_Face face);
     void    doneFreeType(in FT_Library lib);
@@ -115,16 +116,16 @@
     void    outlineDecompose(in FT_Outline_p outline,
                              in const_FT_Outline_Funcs_p funcs, in voidPtr p);
     void    setCharmap(in FT_Face face, in FT_CharMap charmap);
-    void    imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc,
+    void    imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc,
                              in FT_UInt gindex, out FT_Glyph glyph);
-    void    managerLookupSize(in FTC_Manager manager, in FTC_Font font,
-                              out FT_Face face, out FT_Size size);
+    void    managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id,
+                              out FT_Face face);
     void    managerDone(in FTC_Manager manager);
     void    managerNew(in FT_Library lib, in FT_UInt max_faces,
                        in FT_UInt max_sizes, in FT_ULong max_bytes,
                        in FTC_Face_Requester requester, in FT_Pointer req_data,
                        out FTC_Manager manager);
-    void    imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache);
+    void    imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache);
 /* #ifdef MOZ_SVG */
     void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix,
                         in FT_Vector_p delta);
$NetBSD: patch-ai,v 1.9 2004/06/21 14:14:00 taya Exp $

diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetricsPS.cpp
--- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp  2004-02-05 10:57:05.000000000 +0900
+++ ./gfx/src/ps/nsFontMetricsPS.cpp    2004-06-10 23:00:08.000000000 +0900
@@ -1141,10 +1141,10 @@
   
   mPixelSize = NSToIntRound(app2dev * mFont->size);
 
-  mImageDesc.font.face_id    = (void*)mEntry;
-  mImageDesc.font.pix_width  = mPixelSize;
-  mImageDesc.font.pix_height = mPixelSize;
-  mImageDesc.image_type = 0;
+  mImageDesc->face_id = (FTC_FaceID)&mEntry;
+  mImageDesc->width  = mPixelSize;
+  mImageDesc->height = mPixelSize;
+  mImageDesc->flags = 0;
 
   nsresult rv;
   mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
@@ -1190,7 +1190,7 @@
   if (!face)
     return 0;
 
-  FTC_Image_Cache iCache;
+  FTC_ImageCache iCache;
   nsresult rv = mFt2->GetImageCache(&iCache);
   if (NS_FAILED(rv)) {
     NS_ERROR("Failed to get Image Cache");
@@ -1228,8 +1228,8 @@
   
   FTC_Manager cManager;
   mFt2->GetFTCacheManager(&cManager);
-  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
-                                        &face, nsnull);
+  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
+                                        &face);
   NS_ASSERTION(rv==0, "failed to get face/size");
   if (rv)
     return nsnull;
@@ -1622,16 +1622,16 @@
   mEntry->GetFamilyName(fontName);
   mEntry->GetStyleName(styleName);
   
-  mImageDesc.font.face_id    = (void*)mEntry;
+  mImageDesc->face_id = (FTC_FaceID)&mEntry;
   // TT glyph has no relation to size
-  mImageDesc.font.pix_width  = 16;
-  mImageDesc.font.pix_height = 16;
-  mImageDesc.image_type = 0;
+  mImageDesc->width  = 16;
+  mImageDesc->height = 16;
+  mImageDesc->flags = 0;
   FT_Face face = nsnull;
   FTC_Manager cManager;
   mFt2->GetFTCacheManager(&cManager);
-  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
-                                        &face, nsnull);
+  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
+                                        &face);
   if (NS_FAILED(rv))
     return;
 
$NetBSD: patch-aj,v 1.10 2004/06/21 14:14:00 taya Exp $

diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.h ./gfx/src/freetype/nsFreeType.h
--- ../Orig/mozilla/gfx/src/freetype/nsFreeType.h   2004-04-17 06:31:42.000000000 +0900
+++ ./gfx/src/freetype/nsFreeType.h 2004-06-10 23:03:07.000000000 +0900
@@ -104,13 +104,13 @@
 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 @@
   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 @@
   PRLibrary      *mSharedLib;
   FT_Library      mFreeTypeLibrary;
   FTC_Manager     mFTCacheManager;
-  FTC_Image_Cache mImageCache;
+  FTC_ImageCache  mImageCache;
 
   static nsHashtable   *sFontFamilies;
   static nsHashtable   *sRange1CharSetNames;
$NetBSD: patch-ak,v 1.11 2004/06/21 14:14:00 taya Exp $

diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp ./gfx/src/freetype/nsFreeType.cpp
--- ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp 2004-02-08 00:22:30.000000000 +0900
+++ ./gfx/src/freetype/nsFreeType.cpp   2004-06-10 23:05:42.000000000 +0900
@@ -110,11 +110,11 @@
   {"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},
@@ -282,7 +282,7 @@
 } 
  
 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
@@ -291,11 +291,11 @@
 } 
  
 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;
 } 
  
@@ -320,7 +320,7 @@
 } 
  
 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);
@@ -389,7 +389,7 @@
 } 
  
 NS_IMETHODIMP
-nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
+nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
 {
   *aCache = mImageCache;
   return NS_OK;
$NetBSD: patch-al,v 1.9 2004/06/21 14:14:00 taya Exp $

diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h ./gfx/src/ps/nsFontMetricsPS.h
--- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h    2003-04-23 01:25:09.000000000 +0900
+++ ./gfx/src/ps/nsFontMetricsPS.h  2004-06-10 23:06:23.000000000 +0900
@@ -320,7 +320,7 @@
   nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
   nsCOMPtr<nsIFreeType2> mFt2;
   PRUint16        mPixelSize;
-  FTC_Image_Desc  mImageDesc;
+  FTC_ImageType   mImageDesc;
 
 
   static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont,
@@ -363,7 +363,7 @@
 protected:
   nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
   nsCOMPtr<nsIFreeType2> mFt2;
-  FTC_Image_Desc  mImageDesc;
+  FTC_ImageType   mImageDesc;
 };
 #endif
 
$NetBSD: patch-an,v 1.7 2004/06/21 14:14:00 taya Exp $

diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h ./gfx/src/x11shared/nsFontFreeType.h
--- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h  2003-04-23 01:25:13.000000000 +0900
+++ ./gfx/src/x11shared/nsFontFreeType.h    2004-06-10 23:06:35.000000000 +0900
@@ -110,7 +110,7 @@
   XImage *GetXImage(PRUint32 width, PRUint32 height);
   nsITrueTypeFontCatalogEntry *mFaceID;
   PRUint16        mPixelSize;
-  FTC_Image_Desc  mImageDesc;
+  FTC_ImageType   mImageDesc;
   nsCOMPtr<nsIFreeType2> mFt2;
 };
 
$NetBSD: patch-ao,v 1.5 2004/06/21 14:14:00 taya Exp $

diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11shared/nsFontFreeType.cpp
--- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp    2003-12-25 17:24:52.000000000 +0900
+++ ./gfx/src/x11shared/nsFontFreeType.cpp  2004-06-10 23:06:38.000000000 +0900
@@ -177,7 +177,7 @@
   FTC_Manager mgr;
   nsresult rv;
   mFt2->GetFTCacheManager(&mgr);
-  rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull);
+  rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face);
   NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
   if (NS_FAILED(rv))
     return nsnull;
@@ -191,22 +191,15 @@
   PRBool embedded_bimap = PR_FALSE;
   mFaceID = aFaceID;
   mPixelSize = aPixelSize;
-  mImageDesc.font.face_id    = (void*)mFaceID;
-  mImageDesc.font.pix_width  = aPixelSize;
-  mImageDesc.font.pix_height = aPixelSize;
-  mImageDesc.image_type = 0;
+  mImageDesc->face_id = (FTC_FaceID)&mFaceID;
+  mImageDesc->width  = aPixelSize;
+  mImageDesc->height = aPixelSize;
+  mImageDesc->flags = 0;
 
   if (aPixelSize < nsFreeType2::gAntiAliasMinimum) {
-    mImageDesc.image_type |= ftc_image_mono;
     anti_alias = PR_FALSE;
   }
 
-  if (nsFreeType2::gFreeType2Autohinted)
-    mImageDesc.image_type |= ftc_image_flag_autohinted;
-
-  if (nsFreeType2::gFreeType2Unhinted)
-    mImageDesc.image_type |= ftc_image_flag_unhinted;
-
   PRUint32  num_embedded_bitmaps, i;
   PRInt32*  embedded_bitmapheights;
   mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps,
@@ -218,7 +211,6 @@
         if (embedded_bitmapheights[i] == aPixelSize) {
           embedded_bimap = PR_TRUE;
           // unhinted must be set for embedded bitmaps to be used
-          mImageDesc.image_type |= ftc_image_flag_unhinted;
           break;
         }
       }
@@ -312,7 +304,7 @@
   if (!face)
     return NS_ERROR_FAILURE;
 
-  FTC_Image_Cache icache;
+  FTC_ImageCache icache;
   mFt2->GetImageCache(&icache);
   if (!icache)
     return NS_ERROR_FAILURE;
@@ -401,7 +393,7 @@
   if (!face)
     return 0;
 
-  FTC_Image_Cache icache;
+  FTC_ImageCache icache;
   mFt2->GetImageCache(&icache);
   if (!icache)
     return 0;
@@ -723,7 +715,7 @@
     if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
 #endif
 
-  FTC_Image_Cache icache;
+  FTC_ImageCache icache;
   mFt2->GetImageCache(&icache);
   if (!icache)
     return 0; 
1	niro	153	diff -ru ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h ./extensions/transformiix/source/base/ErrorObserver.h
2			--- ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h 2003-01-17 21:39:36.000000000 +0900
3			+++ ./extensions/transformiix/source/base/ErrorObserver.h 2004-06-10 22:56:01.000000000 +0900
4			@@ -28,7 +28,8 @@
5
6			#include "baseutils.h"
7			#include "txError.h"
8			-#include <iostream.h>
9			+#include <iostream>
10			+using namespace std;
11			class nsAString;
12
13			/**
14			diff -ru ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl
15			--- ../Orig/mozilla/gfx/idl/nsIFreeType2.idl 2004-04-16 10:09:33.000000000 +0900
16			+++ ./gfx/idl/nsIFreeType2.idl 2004-06-11 00:32:42.000000000 +0900
17			@@ -76,10 +76,11 @@
18			native FT_Sfnt_Tag(FT_Sfnt_Tag);
19			native FT_Size(FT_Size);
20
21			-[ptr] native FTC_Image_Desc_p(FTC_Image_Desc);
22			+[ptr] native FTC_ImageType_p(FTC_ImageType);
23			native FTC_Face_Requester(FTC_Face_Requester);
24			native FTC_Font(FTC_Font);
25			-native FTC_Image_Cache(FTC_Image_Cache);
26			+native FTC_FaceID(FTC_FaceID);
27			+native FTC_ImageCache(FTC_ImageCache);
28			native FTC_Manager(FTC_Manager);
29
30			// #ifdef MOZ_SVG
31			@@ -99,7 +100,7 @@
32
33			readonly attribute FT_Library library;
34			readonly attribute FTC_Manager FTCacheManager;
35			- readonly attribute FTC_Image_Cache ImageCache;
36			+ readonly attribute FTC_ImageCache ImageCache;
37
38			void doneFace(in FT_Face face);
39			void doneFreeType(in FT_Library lib);
40			@@ -115,16 +116,16 @@
41			void outlineDecompose(in FT_Outline_p outline,
42			in const_FT_Outline_Funcs_p funcs, in voidPtr p);
43			void setCharmap(in FT_Face face, in FT_CharMap charmap);
44			- void imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc,
45			+ void imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc,
46			in FT_UInt gindex, out FT_Glyph glyph);
47			- void managerLookupSize(in FTC_Manager manager, in FTC_Font font,
48			- out FT_Face face, out FT_Size size);
49			+ void managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id,
50			+ out FT_Face face);
51			void managerDone(in FTC_Manager manager);
52			void managerNew(in FT_Library lib, in FT_UInt max_faces,
53			in FT_UInt max_sizes, in FT_ULong max_bytes,
54			in FTC_Face_Requester requester, in FT_Pointer req_data,
55			out FTC_Manager manager);
56			- void imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache);
57			+ void imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache);
58			/* #ifdef MOZ_SVG */
59			void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix,
60			in FT_Vector_p delta);
61			$NetBSD: patch-ai,v 1.9 2004/06/21 14:14:00 taya Exp $
62
63			diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetricsPS.cpp
64			--- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp 2004-02-05 10:57:05.000000000 +0900
65			+++ ./gfx/src/ps/nsFontMetricsPS.cpp 2004-06-10 23:00:08.000000000 +0900
66			@@ -1141,10 +1141,10 @@
67
68			mPixelSize = NSToIntRound(app2dev * mFont->size);
69
70			- mImageDesc.font.face_id = (void*)mEntry;
71			- mImageDesc.font.pix_width = mPixelSize;
72			- mImageDesc.font.pix_height = mPixelSize;
73			- mImageDesc.image_type = 0;
74			+ mImageDesc->face_id = (FTC_FaceID)&mEntry;
75			+ mImageDesc->width = mPixelSize;
76			+ mImageDesc->height = mPixelSize;
77			+ mImageDesc->flags = 0;
78
79			nsresult rv;
80			mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
81			@@ -1190,7 +1190,7 @@
82			if (!face)
83			return 0;
84
85			- FTC_Image_Cache iCache;
86			+ FTC_ImageCache iCache;
87			nsresult rv = mFt2->GetImageCache(&iCache);
88			if (NS_FAILED(rv)) {
89			NS_ERROR("Failed to get Image Cache");
90			@@ -1228,8 +1228,8 @@
91
92			FTC_Manager cManager;
93			mFt2->GetFTCacheManager(&cManager);
94			- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
95			- &face, nsnull);
96			+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
97			+ &face);
98			NS_ASSERTION(rv==0, "failed to get face/size");
99			if (rv)
100			return nsnull;
101			@@ -1622,16 +1622,16 @@
102			mEntry->GetFamilyName(fontName);
103			mEntry->GetStyleName(styleName);
104
105			- mImageDesc.font.face_id = (void*)mEntry;
106			+ mImageDesc->face_id = (FTC_FaceID)&mEntry;
107			// TT glyph has no relation to size
108			- mImageDesc.font.pix_width = 16;
109			- mImageDesc.font.pix_height = 16;
110			- mImageDesc.image_type = 0;
111			+ mImageDesc->width = 16;
112			+ mImageDesc->height = 16;
113			+ mImageDesc->flags = 0;
114			FT_Face face = nsnull;
115			FTC_Manager cManager;
116			mFt2->GetFTCacheManager(&cManager);
117			- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
118			- &face, nsnull);
119			+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
120			+ &face);
121			if (NS_FAILED(rv))
122			return;
123
124			$NetBSD: patch-aj,v 1.10 2004/06/21 14:14:00 taya Exp $
125
126			diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.h ./gfx/src/freetype/nsFreeType.h
127			--- ../Orig/mozilla/gfx/src/freetype/nsFreeType.h 2004-04-17 06:31:42.000000000 +0900
128			+++ ./gfx/src/freetype/nsFreeType.h 2004-06-10 23:03:07.000000000 +0900
129			@@ -104,13 +104,13 @@
130			typedef FT_Error (FT_New_Face_t)(FT_Library, const char, FT_Long, FT_Face*);
131			typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap charmap);
132			typedef FT_Error (*FTC_Image_Cache_Lookup_t)
133			- (FTC_Image_Cache, FTC_Image_Desc, FT_UInt, FT_Glyph);
134			-typedef FT_Error (*FTC_Manager_Lookup_Size_t)
135			- (FTC_Manager, FTC_Font, FT_Face, FT_Size);
136			+ (FTC_ImageCache, FTC_ImageType, FT_UInt, FT_Glyph);
137			+typedef FT_Error (*FTC_Manager_LookupFace_t)
138			+ (FTC_Manager, FTC_FaceID, FT_Face*);
139			typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager);
140			typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong,
141			FTC_Face_Requester, FT_Pointer, FTC_Manager*);
142			-typedef FT_Error (FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache);
143			+typedef FT_Error (FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache);
144			// #ifdef MOZ_SVG
145			typedef FT_Error (FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix, FT_Vector*);
146			typedef FT_Error (*FT_Get_Kerning_t)
147			@@ -165,7 +165,7 @@
148			FT_Outline_Decompose_t nsFT_Outline_Decompose;
149			FT_Set_Charmap_t nsFT_Set_Charmap;
150			FTC_Image_Cache_Lookup_t nsFTC_Image_Cache_Lookup;
151			- FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size;
152			+ FTC_Manager_LookupFace_t nsFTC_Manager_LookupFace;
153			FTC_Manager_Done_t nsFTC_Manager_Done;
154			FTC_Manager_New_t nsFTC_Manager_New;
155			FTC_Image_Cache_New_t nsFTC_Image_Cache_New;
156			@@ -213,7 +213,7 @@
157			PRLibrary *mSharedLib;
158			FT_Library mFreeTypeLibrary;
159			FTC_Manager mFTCacheManager;
160			- FTC_Image_Cache mImageCache;
161			+ FTC_ImageCache mImageCache;
162
163			static nsHashtable *sFontFamilies;
164			static nsHashtable *sRange1CharSetNames;
165			$NetBSD: patch-ak,v 1.11 2004/06/21 14:14:00 taya Exp $
166
167			diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp ./gfx/src/freetype/nsFreeType.cpp
168			--- ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp 2004-02-08 00:22:30.000000000 +0900
169			+++ ./gfx/src/freetype/nsFreeType.cpp 2004-06-10 23:05:42.000000000 +0900
170			@@ -110,11 +110,11 @@
171			{"FT_New_Face", NS_FT2_OFFSET(nsFT_New_Face), PR_TRUE},
172			{"FT_Outline_Decompose", NS_FT2_OFFSET(nsFT_Outline_Decompose), PR_TRUE},
173			{"FT_Set_Charmap", NS_FT2_OFFSET(nsFT_Set_Charmap), PR_TRUE},
174			- {"FTC_Image_Cache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE},
175			- {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE},
176			+ {"FTC_ImageCache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE},
177			+ {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace), PR_TRUE},
178			{"FTC_Manager_Done", NS_FT2_OFFSET(nsFTC_Manager_Done), PR_TRUE},
179			{"FTC_Manager_New", NS_FT2_OFFSET(nsFTC_Manager_New), PR_TRUE},
180			- {"FTC_Image_Cache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE},
181			+ {"FTC_ImageCache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE},
182			// #ifdef MOZ_SVG
183			{"FT_Glyph_Transform", NS_FT2_OFFSET(nsFT_Glyph_Transform), PR_TRUE},
184			{"FT_Get_Kerning", NS_FT2_OFFSET(nsFT_Get_Kerning), PR_TRUE},
185			@@ -282,7 +282,7 @@
186			}
187
188			NS_IMETHODIMP
189			-nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc,
190			+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc,
191			FT_UInt glyphID, FT_Glyph *glyph)
192			{
193			// call the FreeType2 function via the function pointer
194			@@ -291,11 +291,11 @@
195			}
196
197			NS_IMETHODIMP
198			-nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font,
199			- FT_Face face, FT_Size size)
200			+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id,
201			+ FT_Face *face)
202			{
203			// call the FreeType2 function via the function pointer
204			- FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size);
205			+ FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face);
206			return error ? NS_ERROR_FAILURE : NS_OK;
207			}
208
209			@@ -320,7 +320,7 @@
210			}
211
212			NS_IMETHODIMP
213			-nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache)
214			+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache)
215			{
216			// call the FreeType2 function via the function pointer
217			FT_Error error = nsFTC_Image_Cache_New(manager, cache);
218			@@ -389,7 +389,7 @@
219			}
220
221			NS_IMETHODIMP
222			-nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
223			+nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
224			{
225			*aCache = mImageCache;
226			return NS_OK;
227			$NetBSD: patch-al,v 1.9 2004/06/21 14:14:00 taya Exp $
228
229			diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h ./gfx/src/ps/nsFontMetricsPS.h
230			--- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h 2003-04-23 01:25:09.000000000 +0900
231			+++ ./gfx/src/ps/nsFontMetricsPS.h 2004-06-10 23:06:23.000000000 +0900
232			@@ -320,7 +320,7 @@
233			nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
234			nsCOMPtr<nsIFreeType2> mFt2;
235			PRUint16 mPixelSize;
236			- FTC_Image_Desc mImageDesc;
237			+ FTC_ImageType mImageDesc;
238
239
240			static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont,
241			@@ -363,7 +363,7 @@
242			protected:
243			nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
244			nsCOMPtr<nsIFreeType2> mFt2;
245			- FTC_Image_Desc mImageDesc;
246			+ FTC_ImageType mImageDesc;
247			};
248			#endif
249
250			$NetBSD: patch-an,v 1.7 2004/06/21 14:14:00 taya Exp $
251
252			diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h ./gfx/src/x11shared/nsFontFreeType.h
253			--- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h 2003-04-23 01:25:13.000000000 +0900
254			+++ ./gfx/src/x11shared/nsFontFreeType.h 2004-06-10 23:06:35.000000000 +0900
255			@@ -110,7 +110,7 @@
256			XImage *GetXImage(PRUint32 width, PRUint32 height);
257			nsITrueTypeFontCatalogEntry *mFaceID;
258			PRUint16 mPixelSize;
259			- FTC_Image_Desc mImageDesc;
260			+ FTC_ImageType mImageDesc;
261			nsCOMPtr<nsIFreeType2> mFt2;
262			};
263
264			$NetBSD: patch-ao,v 1.5 2004/06/21 14:14:00 taya Exp $
265
266			diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11shared/nsFontFreeType.cpp
267			--- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp 2003-12-25 17:24:52.000000000 +0900
268			+++ ./gfx/src/x11shared/nsFontFreeType.cpp 2004-06-10 23:06:38.000000000 +0900
269			@@ -177,7 +177,7 @@
270			FTC_Manager mgr;
271			nsresult rv;
272			mFt2->GetFTCacheManager(&mgr);
273			- rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull);
274			+ rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face);
275			NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
276			if (NS_FAILED(rv))
277			return nsnull;
278			@@ -191,22 +191,15 @@
279			PRBool embedded_bimap = PR_FALSE;
280			mFaceID = aFaceID;
281			mPixelSize = aPixelSize;
282			- mImageDesc.font.face_id = (void*)mFaceID;
283			- mImageDesc.font.pix_width = aPixelSize;
284			- mImageDesc.font.pix_height = aPixelSize;
285			- mImageDesc.image_type = 0;
286			+ mImageDesc->face_id = (FTC_FaceID)&mFaceID;
287			+ mImageDesc->width = aPixelSize;
288			+ mImageDesc->height = aPixelSize;
289			+ mImageDesc->flags = 0;
290
291			if (aPixelSize < nsFreeType2::gAntiAliasMinimum) {
292			- mImageDesc.image_type \|= ftc_image_mono;
293			anti_alias = PR_FALSE;
294			}
295
296			- if (nsFreeType2::gFreeType2Autohinted)
297			- mImageDesc.image_type \|= ftc_image_flag_autohinted;
298			-
299			- if (nsFreeType2::gFreeType2Unhinted)
300			- mImageDesc.image_type \|= ftc_image_flag_unhinted;
301			-
302			PRUint32 num_embedded_bitmaps, i;
303			PRInt32* embedded_bitmapheights;
304			mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps,
305			@@ -218,7 +211,6 @@
306			if (embedded_bitmapheights[i] == aPixelSize) {
307			embedded_bimap = PR_TRUE;
308			// unhinted must be set for embedded bitmaps to be used
309			- mImageDesc.image_type \|= ftc_image_flag_unhinted;
310			break;
311			}
312			}
313			@@ -312,7 +304,7 @@
314			if (!face)
315			return NS_ERROR_FAILURE;
316
317			- FTC_Image_Cache icache;
318			+ FTC_ImageCache icache;
319			mFt2->GetImageCache(&icache);
320			if (!icache)
321			return NS_ERROR_FAILURE;
322			@@ -401,7 +393,7 @@
323			if (!face)
324			return 0;
325
326			- FTC_Image_Cache icache;
327			+ FTC_ImageCache icache;
328			mFt2->GetImageCache(&icache);
329			if (!icache)
330			return 0;
331			@@ -723,7 +715,7 @@
332			if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
333			#endif
334
335			- FTC_Image_Cache icache;
336			+ FTC_ImageCache icache;
337			mFt2->GetImageCache(&icache);
338			if (!icache)
339			return 0;