1 --- mozilla-orig/gfx/idl/nsIFreeType2.idl 2004-07-15 11:24:14.000000000 +0000
2 +++ mozilla/gfx/idl/nsIFreeType2.idl 2004-07-15 11:28:26.000000000 +0000
4 native FT_Sfnt_Tag(FT_Sfnt_Tag);
5 native FT_Size(FT_Size);
7 -[ptr] native FTC_Image_Desc_p(FTC_Image_Desc);
8 +[ptr] native FTC_ImageType_p(FTC_ImageType);
9 native FTC_Face_Requester(FTC_Face_Requester);
10 native FTC_Font(FTC_Font);
11 -native FTC_Image_Cache(FTC_Image_Cache);
12 +native FTC_FaceID(FTC_FaceID);
13 +native FTC_ImageCache(FTC_ImageCache);
14 native FTC_Manager(FTC_Manager);
19 readonly attribute FT_Library library;
20 readonly attribute FTC_Manager FTCacheManager;
21 - readonly attribute FTC_Image_Cache ImageCache;
22 + readonly attribute FTC_ImageCache ImageCache;
24 void doneFace(in FT_Face face);
25 void doneFreeType(in FT_Library lib);
27 void outlineDecompose(in FT_Outline_p outline,
28 in const_FT_Outline_Funcs_p funcs, in voidPtr p);
29 void setCharmap(in FT_Face face, in FT_CharMap charmap);
30 - void imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc,
31 + void imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc,
32 in FT_UInt gindex, out FT_Glyph glyph);
33 - void managerLookupSize(in FTC_Manager manager, in FTC_Font font,
34 - out FT_Face face, out FT_Size size);
35 + void managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id,
37 void managerDone(in FTC_Manager manager);
38 void managerNew(in FT_Library lib, in FT_UInt max_faces,
39 in FT_UInt max_sizes, in FT_ULong max_bytes,
40 in FTC_Face_Requester requester, in FT_Pointer req_data,
41 out FTC_Manager manager);
42 - void imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache);
43 + void imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache);
45 void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix,
46 in FT_Vector_p delta);
47 --- mozilla-orig/gfx/src/freetype/nsFreeType.cpp 2004-07-15 11:24:14.000000000 +0000
48 +++ mozilla/gfx/src/freetype/nsFreeType.cpp 2004-07-15 11:28:26.000000000 +0000
50 {"FT_New_Face", NS_FT2_OFFSET(nsFT_New_Face), PR_TRUE},
51 {"FT_Outline_Decompose", NS_FT2_OFFSET(nsFT_Outline_Decompose), PR_TRUE},
52 {"FT_Set_Charmap", NS_FT2_OFFSET(nsFT_Set_Charmap), PR_TRUE},
53 - {"FTC_Image_Cache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE},
54 - {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE},
55 + {"FTC_ImageCache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE},
56 + {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace), PR_TRUE},
57 {"FTC_Manager_Done", NS_FT2_OFFSET(nsFTC_Manager_Done), PR_TRUE},
58 {"FTC_Manager_New", NS_FT2_OFFSET(nsFTC_Manager_New), PR_TRUE},
59 - {"FTC_Image_Cache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE},
60 + {"FTC_ImageCache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE},
62 {"FT_Glyph_Transform", NS_FT2_OFFSET(nsFT_Glyph_Transform), PR_TRUE},
63 {"FT_Get_Kerning", NS_FT2_OFFSET(nsFT_Get_Kerning), PR_TRUE},
68 -nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc,
69 +nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc,
70 FT_UInt glyphID, FT_Glyph *glyph)
72 // call the FreeType2 function via the function pointer
77 -nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font,
78 - FT_Face *face, FT_Size *size)
79 +nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id,
82 // call the FreeType2 function via the function pointer
83 - FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size);
84 + FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face);
85 return error ? NS_ERROR_FAILURE : NS_OK;
92 -nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache)
93 +nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache)
95 // call the FreeType2 function via the function pointer
96 FT_Error error = nsFTC_Image_Cache_New(manager, cache);
101 -nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
102 +nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
104 *aCache = mImageCache;
106 --- mozilla-orig/gfx/src/freetype/nsFreeType.h 2004-07-15 11:24:14.000000000 +0000
107 +++ mozilla/gfx/src/freetype/nsFreeType.h 2004-07-15 11:28:26.000000000 +0000
108 @@ -104,13 +104,13 @@
109 typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*);
110 typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap charmap);
111 typedef FT_Error (*FTC_Image_Cache_Lookup_t)
112 - (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*);
113 -typedef FT_Error (*FTC_Manager_Lookup_Size_t)
114 - (FTC_Manager, FTC_Font, FT_Face*, FT_Size*);
115 + (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*);
116 +typedef FT_Error (*FTC_Manager_LookupFace_t)
117 + (FTC_Manager, FTC_FaceID, FT_Face*);
118 typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager);
119 typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong,
120 FTC_Face_Requester, FT_Pointer, FTC_Manager*);
121 -typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*);
122 +typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*);
124 typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*);
125 typedef FT_Error (*FT_Get_Kerning_t)
127 FT_Outline_Decompose_t nsFT_Outline_Decompose;
128 FT_Set_Charmap_t nsFT_Set_Charmap;
129 FTC_Image_Cache_Lookup_t nsFTC_Image_Cache_Lookup;
130 - FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size;
131 + FTC_Manager_LookupFace_t nsFTC_Manager_LookupFace;
132 FTC_Manager_Done_t nsFTC_Manager_Done;
133 FTC_Manager_New_t nsFTC_Manager_New;
134 FTC_Image_Cache_New_t nsFTC_Image_Cache_New;
136 PRLibrary *mSharedLib;
137 FT_Library mFreeTypeLibrary;
138 FTC_Manager mFTCacheManager;
139 - FTC_Image_Cache mImageCache;
140 + FTC_ImageCache mImageCache;
142 static nsHashtable *sFontFamilies;
143 static nsHashtable *sRange1CharSetNames;
144 --- mozilla-orig/gfx/src/ps/nsFontMetricsPS.cpp 2004-07-15 11:24:14.000000000 +0000
145 +++ mozilla/gfx/src/ps/nsFontMetricsPS.cpp 2004-07-15 11:28:26.000000000 +0000
146 @@ -1141,10 +1141,10 @@
148 mPixelSize = NSToIntRound(app2dev * mFont->size);
150 - mImageDesc.font.face_id = (void*)mEntry;
151 - mImageDesc.font.pix_width = mPixelSize;
152 - mImageDesc.font.pix_height = mPixelSize;
153 - mImageDesc.image_type = 0;
154 + mImageDesc->face_id = (FTC_FaceID)&mEntry;
155 + mImageDesc->width = mPixelSize;
156 + mImageDesc->height = mPixelSize;
157 + mImageDesc->flags = 0;
160 mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
161 @@ -1190,7 +1190,7 @@
165 - FTC_Image_Cache iCache;
166 + FTC_ImageCache iCache;
167 nsresult rv = mFt2->GetImageCache(&iCache);
169 NS_ERROR("Failed to get Image Cache");
170 @@ -1228,8 +1228,8 @@
172 FTC_Manager cManager;
173 mFt2->GetFTCacheManager(&cManager);
174 - nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
176 + nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
178 NS_ASSERTION(rv==0, "failed to get face/size");
181 @@ -1622,16 +1622,16 @@
182 mEntry->GetFamilyName(fontName);
183 mEntry->GetStyleName(styleName);
185 - mImageDesc.font.face_id = (void*)mEntry;
186 + mImageDesc->face_id = (FTC_FaceID)&mEntry;
187 // TT glyph has no relation to size
188 - mImageDesc.font.pix_width = 16;
189 - mImageDesc.font.pix_height = 16;
190 - mImageDesc.image_type = 0;
191 + mImageDesc->width = 16;
192 + mImageDesc->height = 16;
193 + mImageDesc->flags = 0;
194 FT_Face face = nsnull;
195 FTC_Manager cManager;
196 mFt2->GetFTCacheManager(&cManager);
197 - nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
199 + nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
204 --- mozilla-orig/gfx/src/ps/nsFontMetricsPS.h 2004-07-15 11:24:14.000000000 +0000
205 +++ mozilla/gfx/src/ps/nsFontMetricsPS.h 2004-07-15 11:28:26.000000000 +0000
207 nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
208 nsCOMPtr<nsIFreeType2> mFt2;
210 - FTC_Image_Desc mImageDesc;
211 + FTC_ImageType mImageDesc;
214 static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont,
217 nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
218 nsCOMPtr<nsIFreeType2> mFt2;
219 - FTC_Image_Desc mImageDesc;
220 + FTC_ImageType mImageDesc;
224 --- mozilla-orig/gfx/src/x11shared/nsFontFreeType.cpp 2004-07-15 11:24:14.000000000 +0000
225 +++ mozilla/gfx/src/x11shared/nsFontFreeType.cpp 2004-07-15 11:28:26.000000000 +0000
229 mFt2->GetFTCacheManager(&mgr);
230 - rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull);
231 + rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face);
232 NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
235 @@ -191,22 +191,15 @@
236 PRBool embedded_bimap = PR_FALSE;
238 mPixelSize = aPixelSize;
239 - mImageDesc.font.face_id = (void*)mFaceID;
240 - mImageDesc.font.pix_width = aPixelSize;
241 - mImageDesc.font.pix_height = aPixelSize;
242 - mImageDesc.image_type = 0;
243 + mImageDesc->face_id = (FTC_FaceID)&mFaceID;
244 + mImageDesc->width = aPixelSize;
245 + mImageDesc->height = aPixelSize;
246 + mImageDesc->flags = 0;
248 if (aPixelSize < nsFreeType2::gAntiAliasMinimum) {
249 - mImageDesc.image_type |= ftc_image_mono;
250 anti_alias = PR_FALSE;
253 - if (nsFreeType2::gFreeType2Autohinted)
254 - mImageDesc.image_type |= ftc_image_flag_autohinted;
256 - if (nsFreeType2::gFreeType2Unhinted)
257 - mImageDesc.image_type |= ftc_image_flag_unhinted;
259 PRUint32 num_embedded_bitmaps, i;
260 PRInt32* embedded_bitmapheights;
261 mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps,
263 if (embedded_bitmapheights[i] == aPixelSize) {
264 embedded_bimap = PR_TRUE;
265 // unhinted must be set for embedded bitmaps to be used
266 - mImageDesc.image_type |= ftc_image_flag_unhinted;
272 return NS_ERROR_FAILURE;
274 - FTC_Image_Cache icache;
275 + FTC_ImageCache icache;
276 mFt2->GetImageCache(&icache);
278 return NS_ERROR_FAILURE;
283 - FTC_Image_Cache icache;
284 + FTC_ImageCache icache;
285 mFt2->GetImageCache(&icache);
289 if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
292 - FTC_Image_Cache icache;
293 + FTC_ImageCache icache;
294 mFt2->GetImageCache(&icache);
297 --- mozilla-orig/gfx/src/x11shared/nsFontFreeType.h 2004-07-15 11:24:14.000000000 +0000
298 +++ mozilla/gfx/src/x11shared/nsFontFreeType.h 2004-07-15 11:28:26.000000000 +0000
300 XImage *GetXImage(PRUint32 width, PRUint32 height);
301 nsITrueTypeFontCatalogEntry *mFaceID;
303 - FTC_Image_Desc mImageDesc;
304 + FTC_ImageType mImageDesc;
305 nsCOMPtr<nsIFreeType2> mFt2;