diff options
| author | Keith Packard <keithp@koto.keithp.com> | 2007-10-25 01:35:32 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@koto.keithp.com> | 2007-10-25 01:35:32 -0700 |
| commit | 7f46cdbb87a4a2113effb45c6e67b00a86363234 (patch) | |
| tree | e40fde300762293cc490edecebb907267fc31b93 /src | |
| parent | 43d0454597dfb5375b1268edb79172779cc51113 (diff) | |
Ensure weight/slant values present even when style is supplied (bug 9313).
If the provided style value doesn't match any available font, fall back to
using the weight and slant values by ensuring that those are in the pattern.
Diffstat (limited to 'src')
| -rw-r--r-- | src/fcdefault.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/fcdefault.c b/src/fcdefault.c index 4e5823bb..e654dc49 100644 --- a/src/fcdefault.c +++ b/src/fcdefault.c @@ -122,17 +122,11 @@ FcDefaultSubstitute (FcPattern *pattern) FcValue v; int i; - if (FcPatternObjectGet (pattern, FC_STYLE_OBJECT, 0, &v) == FcResultNoMatch) - { - if (FcPatternObjectGet (pattern, FC_WEIGHT_OBJECT, 0, &v) == FcResultNoMatch ) - { - FcPatternObjectAddInteger (pattern, FC_WEIGHT_OBJECT, FC_WEIGHT_MEDIUM); - } - if (FcPatternObjectGet (pattern, FC_SLANT_OBJECT, 0, &v) == FcResultNoMatch) - { - FcPatternObjectAddInteger (pattern, FC_SLANT_OBJECT, FC_SLANT_ROMAN); - } - } + if (FcPatternObjectGet (pattern, FC_WEIGHT_OBJECT, 0, &v) == FcResultNoMatch ) + FcPatternObjectAddInteger (pattern, FC_WEIGHT_OBJECT, FC_WEIGHT_MEDIUM); + + if (FcPatternObjectGet (pattern, FC_SLANT_OBJECT, 0, &v) == FcResultNoMatch) + FcPatternObjectAddInteger (pattern, FC_SLANT_OBJECT, FC_SLANT_ROMAN); if (FcPatternObjectGet (pattern, FC_WIDTH_OBJECT, 0, &v) == FcResultNoMatch) FcPatternObjectAddInteger (pattern, FC_WIDTH_OBJECT, FC_WIDTH_NORMAL); |