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; }