From e30ce6a46433793ce377659b3b6462e2e4e5946c Mon Sep 17 00:00:00 2001 From: "bzbarsky%mit.edu" Date: Sat, 11 Nov 2006 04:56:22 +0000 Subject: [PATCH] Set face index correctly. Bug 350455, patch by ToshihiroYamagishi , r=mozilla@behdad.org, sr=bzbarsky git-svn-id: svn://10.0.0.236/trunk@215148 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/gfx/src/ps/nsFontMetricsPS.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mozilla/gfx/src/ps/nsFontMetricsPS.cpp b/mozilla/gfx/src/ps/nsFontMetricsPS.cpp index 4c6afbe12c4..730205a3898 100644 --- a/mozilla/gfx/src/ps/nsFontMetricsPS.cpp +++ b/mozilla/gfx/src/ps/nsFontMetricsPS.cpp @@ -742,6 +742,7 @@ nsXftEntry::nsXftEntry(FcPattern *aFontPattern) mFaceIndex = 0; char *fcResult; + int fcIndex; if (FcPatternGetString(aFontPattern, FC_FILE, 0, (FcChar8 **) &fcResult) == FcResultMatch) @@ -754,6 +755,10 @@ nsXftEntry::nsXftEntry(FcPattern *aFontPattern) if (FcPatternGetString(aFontPattern, FC_STYLE, 0, (FcChar8 **) &fcResult) == FcResultMatch) mStyleName = fcResult; + + if (FcPatternGetInteger(aFontPattern, FC_INDEX, 0, &fcIndex) + == FcResultMatch) + mFaceIndex = fcIndex; }