1 --- ./gfx/src/ps/nsFontMetricsPS.cpp.orig 2004-07-24 01:55:08.000000000 +0200
2 +++ ./gfx/src/ps/nsFontMetricsPS.cpp 2004-07-24 01:58:58.000000000 +0200
3 @@ -1141,10 +1141,10 @@
5 mPixelSize = NSToIntRound(app2dev * mFont->size);
7 - mImageDesc.font.face_id = (void*)mEntry;
8 - mImageDesc.font.pix_width = mPixelSize;
9 - mImageDesc.font.pix_height = mPixelSize;
10 - mImageDesc.image_type = 0;
11 + mImageDesc->face_id = (void*)mEntry;
12 + mImageDesc->width = mPixelSize;
13 + mImageDesc->height = mPixelSize;
14 + mImageDesc->flags = 0;
17 mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
22 - FTC_Image_Cache iCache;
23 + FTC_ImageCache iCache;
24 nsresult rv = mFt2->GetImageCache(&iCache);
26 NS_ERROR("Failed to get Image Cache");
30 mFt2->GetFTCacheManager(&cManager);
31 - nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
33 + nsresult rv = mFt2->ManagerLookupFace(cManager, &mImageDesc->face_id,
35 NS_ASSERTION(rv==0, "failed to get face/size");
38 @@ -1622,16 +1622,16 @@
39 mEntry->GetFamilyName(fontName);
40 mEntry->GetStyleName(styleName);
42 - mImageDesc.font.face_id = (void*)mEntry;
43 + mImageDesc->face_id = (FTC_FaceID)&mEntry;
44 // TT glyph has no relation to size
45 - mImageDesc.font.pix_width = 16;
46 - mImageDesc.font.pix_height = 16;
47 - mImageDesc.image_type = 0;
48 + mImageDesc->width = 16;
49 + mImageDesc->height = 16;
50 + mImageDesc->flags = 0;
51 FT_Face face = nsnull;
53 mFt2->GetFTCacheManager(&cManager);
54 - nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
56 + nsresult rv = mFt2->ManagerLookupFace(cManager, &mImageDesc->face_id,