mozilla-firefox/patches/mozilla-firefox-1.0.7-freetype-compile.patch

$NetBSD: patch-ag,v 1.15 2004/06/21 14:14:00 taya Exp $

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