da14c0cfbf
The Sunbird Project is a redesign of the Calendar component. The goal is to produce a cross platform standalone calendar application based on Mozilla's XUL user interface language. At the moment the Sunbird name is a project name. It is not official and may change in the future. The intended user is someone who uses Mozilla Firefox and Mozilla Thunderbird and wants a calendar application based on Mozilla. Ok with wiz. I'll add a -gtk1 version later this week.
49 lines
2.2 KiB
Text
49 lines
2.2 KiB
Text
$NetBSD: patch-by,v 1.1.1.1 2006/02/05 21:56:26 ghen Exp $
|
|
|
|
--- layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp.orig 2006-02-02 16:57:57.000000000 +0100
|
|
+++ layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp
|
|
@@ -155,15 +155,15 @@ void NS_InitSVGLibartGlyphMetricsFTGloba
|
|
|
|
static NS_NAMED_LITERAL_STRING(arial, "arial");
|
|
nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("helvetica"),
|
|
- &arial);
|
|
+ (nsDependentString *)&arial);
|
|
|
|
static NS_NAMED_LITERAL_STRING(courier, "courier new");
|
|
nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("courier"),
|
|
- &courier);
|
|
+ (nsDependentString *)&courier);
|
|
|
|
static NS_NAMED_LITERAL_STRING(times, "times new roman");
|
|
nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("times"),
|
|
- ×);
|
|
+ (nsDependentString *)×);
|
|
}
|
|
|
|
void NS_FreeSVGLibartGlyphMetricsFTGlobals()
|
|
@@ -422,19 +422,19 @@ nsSVGLibartGlyphMetricsFT::InitializeFac
|
|
return;
|
|
}
|
|
|
|
- FTC_Image_Desc imageDesc;
|
|
- imageDesc.font.face_id=(void*)font_data.font_entry.get(); // XXX do we need to addref?
|
|
+ FTC_ImageType imageDesc;
|
|
+ imageDesc->face_id = (FTC_FaceID)font_data.font_entry.get(); // XXX do we need to addref?
|
|
float twipstopixel = GetTwipsToPixels();
|
|
float scale = GetPixelScale();
|
|
- imageDesc.font.pix_width = (int)((float)(font_data.font.size)*twipstopixel/scale);
|
|
- imageDesc.font.pix_height = (int)((float)(font_data.font.size)*twipstopixel/scale);
|
|
- imageDesc.image_type |= ftc_image_grays;
|
|
+ imageDesc->width = (int)((float)(font_data.font.size)*twipstopixel/scale);
|
|
+ imageDesc->height = (int)((float)(font_data.font.size)*twipstopixel/scale);
|
|
+ imageDesc->flags = 0;
|
|
|
|
// get the face
|
|
nsresult rv;
|
|
FTC_Manager mgr;
|
|
nsSVGLibartFreetype::ft2->GetFTCacheManager(&mgr);
|
|
- rv = nsSVGLibartFreetype::ft2->ManagerLookupSize(mgr, &imageDesc.font, &mFace, nsnull);
|
|
+ rv = nsSVGLibartFreetype::ft2->ManagerLookupFace(mgr, imageDesc->face_id, &mFace);
|
|
NS_ASSERTION(mFace, "failed to get face/size");
|
|
}
|
|
|