Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use FC_PIXEL_SIZE instead of pango_font_describe_with_absolute_size

Browse Source 
b=414239 r+sr=roc


git-svn-id: svn://10.0.0.236/trunk@245173 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
karlt+%karlt.net
2008-02-07 22:17:50 +00:00
parent cefb9670e3
commit 48b8098416
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/gfx/thebes/src/gfxPangoFonts.cpp
View File

@@ -376,14 +376,18 @@ gfxPangoFont::GetOrMakeFont(PangoFont *aPangoFont)
(g_object_get_qdata(G_OBJECT(aPangoFont), GetFontQuark()));
if (!font) {
PangoFontDescription *desc =
pango_font_describe_with_absolute_size(aPangoFont);
// pango_font_describe_with_absolute_size requires Pango-1.14
PangoFontDescription *desc = pango_font_describe(aPangoFont);
PangoFcFont *fcfont = PANGO_FC_FONT(aPangoFont);
double size;
if (FcPatternGetDouble(fcfont->font_pattern, FC_PIXEL_SIZE, 0, &size)
!= FcResultMatch)
size = pango_font_description_get_size(desc) / FLOAT_PANGO_SCALE;
// Shouldn't actually need to take too much care about the correct
// family or style, as size is the only thing expected to be
// important.
gfxFloat size =
pango_font_description_get_size(desc) / FLOAT_PANGO_SCALE;
PRUint8 style =
PangoStyleToThebesStyle(pango_font_description_get_style(desc));
PRUint16 weight = pango_font_description_get_weight(desc);