diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-08-08 17:05:41 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-08-08 17:05:41 +0000 |
| commit | 8c6c79abdb8e9afc1aa63e108ee208c80eb07b77 (patch) | |
| tree | aeeeee84a4d591e44c2d2251042f6073d4d108b5 | |
| parent | a4204dc3f893323a89fdc1b11e49b9ad6c334edc (diff) | |
| download | pango-8c6c79abdb8e9afc1aa63e108ee208c80eb07b77.tar.gz | |
Move DPI substitution before FcDefaultSubstitute so it actually works.
Fri Aug 8 12:59:42 2003 Owen Taylor <otaylor@redhat.com>
* pango/pangoft2-fontmap.c (pango_ft2_font_map_default_substitute):
Move DPI substitution before FcDefaultSubstitute so
it actually works.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 6 | ||||
| -rw-r--r-- | pango/pangoft2-fontmap.c | 2 |
6 files changed, 31 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Fri Aug 8 12:59:42 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pangoft2-fontmap.c (pango_ft2_font_map_default_substitute): + Move DPI substitution before FcDefaultSubstitute so + it actually works. + 2003-08-05 Tor Lillqvist <tml@iki.fi> * modules/basic/basic-win32.c (text_is_simple): New function. Uses diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 1102ceff..2dc98dd4 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +Fri Aug 8 12:59:42 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pangoft2-fontmap.c (pango_ft2_font_map_default_substitute): + Move DPI substitution before FcDefaultSubstitute so + it actually works. + 2003-08-05 Tor Lillqvist <tml@iki.fi> * modules/basic/basic-win32.c (text_is_simple): New function. Uses diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 1102ceff..2dc98dd4 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,9 @@ +Fri Aug 8 12:59:42 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pangoft2-fontmap.c (pango_ft2_font_map_default_substitute): + Move DPI substitution before FcDefaultSubstitute so + it actually works. + 2003-08-05 Tor Lillqvist <tml@iki.fi> * modules/basic/basic-win32.c (text_is_simple): New function. Uses diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 1102ceff..2dc98dd4 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +Fri Aug 8 12:59:42 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pangoft2-fontmap.c (pango_ft2_font_map_default_substitute): + Move DPI substitution before FcDefaultSubstitute so + it actually works. + 2003-08-05 Tor Lillqvist <tml@iki.fi> * modules/basic/basic-win32.c (text_is_simple): New function. Uses diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 1102ceff..2dc98dd4 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +Fri Aug 8 12:59:42 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pangoft2-fontmap.c (pango_ft2_font_map_default_substitute): + Move DPI substitution before FcDefaultSubstitute so + it actually works. + 2003-08-05 Tor Lillqvist <tml@iki.fi> * modules/basic/basic-win32.c (text_is_simple): New function. Uses diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c index 9feea38f..df643b64 100644 --- a/pango/pangoft2-fontmap.c +++ b/pango/pangoft2-fontmap.c @@ -342,7 +342,7 @@ pango_fc_default_substitute (PangoFT2FontMap *fontmap, if (fontmap->substitute_func) fontmap->substitute_func (pattern, fontmap->substitute_data); - FcDefaultSubstitute (pattern); if (FcPatternGet (pattern, FC_DPI, 0, &v) == FcResultNoMatch) FcPatternAddDouble (pattern, FC_DPI, fontmap->dpi_y); + FcDefaultSubstitute (pattern); } |