summaryrefslogtreecommitdiff
path: root/vcl/generic/fontmanager/fontconfig.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/generic/fontmanager/fontconfig.cxx')
-rw-r--r--vcl/generic/fontmanager/fontconfig.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx
index 20e7768f6368..3d3bd81fb835 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -529,6 +529,7 @@ void PrintFontManager::countFontconfigFonts( boost::unordered_map<OString, int,
FcChar8* format = NULL;
int slant = 0;
int weight = 0;
+ int width = 0;
int spacing = 0;
int nCollectionEntry = -1;
FcBool outline = false;
@@ -538,6 +539,7 @@ void PrintFontManager::countFontconfigFonts( boost::unordered_map<OString, int,
FcResult eStyleRes = rWrapper.LocalizedElementFromPattern( pFSet->fonts[i], &style, FC_STYLE, FC_STYLELANG );
FcResult eSlantRes = FcPatternGetInteger(pFSet->fonts[i], FC_SLANT, 0, &slant);
FcResult eWeightRes = FcPatternGetInteger(pFSet->fonts[i], FC_WEIGHT, 0, &weight);
+ FcResult eWidthRes = FcPatternGetInteger(pFSet->fonts[i], FC_WIDTH, 0, &width);
FcResult eSpacRes = FcPatternGetInteger(pFSet->fonts[i], FC_SPACING, 0, &spacing);
FcResult eOutRes = FcPatternGetBool(pFSet->fonts[i], FC_OUTLINE, 0, &outline);
FcResult eIndexRes = FcPatternGetInteger(pFSet->fonts[i], FC_INDEX, 0, &nCollectionEntry);
@@ -549,11 +551,12 @@ void PrintFontManager::countFontconfigFonts( boost::unordered_map<OString, int,
#if (OSL_DEBUG_LEVEL > 2)
fprintf( stderr, "found font \"%s\" in file %s\n"
" weight = %d, slant = %d, style = \"%s\"\n"
- " spacing = %d, outline = %d, format %s\n"
+ " width = %d, spacing = %d, outline = %d, format %s\n"
, family, file
, eWeightRes == FcResultMatch ? weight : -1
, eSpacRes == FcResultMatch ? slant : -1
, eStyleRes == FcResultMatch ? (const char*) style : "<nil>"
+ , eWeightRes == FcResultMatch ? width : -1
, eSpacRes == FcResultMatch ? spacing : -1
, eOutRes == FcResultMatch ? outline : -1
, eFormatRes == FcResultMatch ? (const char*)format : "<unknown>"
@@ -655,6 +658,8 @@ void PrintFontManager::countFontconfigFonts( boost::unordered_map<OString, int,
}
if( eWeightRes == FcResultMatch )
pUpdate->m_eWeight = convertWeight(weight);
+ if( eWidthRes == FcResultMatch )
+ pUpdate->m_eWidth = convertWidth(width);
if( eSpacRes == FcResultMatch )
pUpdate->m_ePitch = convertSpacing(spacing);
if( eSlantRes == FcResultMatch )