1 --- ./gfx/src/x11shared/nsFontFreeType.cpp.orig 2004-07-24 02:02:30.000000000 +0200
2 +++ ./gfx/src/x11shared/nsFontFreeType.cpp 2004-07-24 02:05:19.000000000 +0200
6 mFt2->GetFTCacheManager(&mgr);
7 - rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull);
8 + rv = mFt2->ManagerLookupFace(mgr, &mImageDesc->face_id, &face);
9 NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
13 PRBool embedded_bimap = PR_FALSE;
15 mPixelSize = aPixelSize;
16 - mImageDesc.font.face_id = (void*)mFaceID;
17 - mImageDesc.font.pix_width = aPixelSize;
18 - mImageDesc.font.pix_height = aPixelSize;
19 - mImageDesc.image_type = 0;
20 + mImageDesc.->face_id = (FTC_FaceID)mFaceID;
21 + mImageDesc->width = aPixelSize;
22 + mImageDesc->height = aPixelSize;
23 + mImageDesc->flags = 0;
25 if (aPixelSize < nsFreeType2::gAntiAliasMinimum) {
26 - mImageDesc.image_type |= ftc_image_mono;
27 anti_alias = PR_FALSE;
30 - if (nsFreeType2::gFreeType2Autohinted)
31 - mImageDesc.image_type |= ftc_image_flag_autohinted;
33 - if (nsFreeType2::gFreeType2Unhinted)
34 - mImageDesc.image_type |= ftc_image_flag_unhinted;
36 PRUint32 num_embedded_bitmaps, i;
37 PRInt32* embedded_bitmapheights;
38 mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps,
40 if (embedded_bitmapheights[i] == aPixelSize) {
41 embedded_bimap = PR_TRUE;
42 // unhinted must be set for embedded bitmaps to be used
43 - mImageDesc.image_type |= ftc_image_flag_unhinted;
49 return NS_ERROR_FAILURE;
51 - FTC_Image_Cache icache;
52 + FTC_ImageCache icache;
53 mFt2->GetImageCache(&icache);
55 return NS_ERROR_FAILURE;
60 - FTC_Image_Cache icache;
61 + FTC_ImageCache icache;
62 mFt2->GetImageCache(&icache);
66 if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
69 - FTC_Image_Cache icache;
70 + FTC_ImageCache icache;
71 mFt2->GetImageCache(&icache);