summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-1-106
-rw-r--r--ChangeLog.pre-1-46
-rw-r--r--ChangeLog.pre-1-66
-rw-r--r--ChangeLog.pre-1-86
-rw-r--r--pango/pangoft2-fontmap.c2
6 files changed, 31 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f46b4bae..eecf9063 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
+
Fri Aug 8 11:45:15 2003 Owen Taylor <otaylor@redhat.com>
* examples/pangoft2topgm.c: Replace --family/--scale
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index f46b4bae..eecf9063 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.
+
Fri Aug 8 11:45:15 2003 Owen Taylor <otaylor@redhat.com>
* examples/pangoft2topgm.c: Replace --family/--scale
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index f46b4bae..eecf9063 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.
+
Fri Aug 8 11:45:15 2003 Owen Taylor <otaylor@redhat.com>
* examples/pangoft2topgm.c: Replace --family/--scale
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index f46b4bae..eecf9063 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.
+
Fri Aug 8 11:45:15 2003 Owen Taylor <otaylor@redhat.com>
* examples/pangoft2topgm.c: Replace --family/--scale
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index f46b4bae..eecf9063 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.
+
Fri Aug 8 11:45:15 2003 Owen Taylor <otaylor@redhat.com>
* examples/pangoft2topgm.c: Replace --family/--scale
diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c
index bd49ec58..7efe0287 100644
--- a/pango/pangoft2-fontmap.c
+++ b/pango/pangoft2-fontmap.c
@@ -342,9 +342,9 @@ pango_ft2_font_map_default_substitute (PangoFcFontMap *fcfontmap,
if (ft2fontmap->substitute_func)
ft2fontmap->substitute_func (pattern, ft2fontmap->substitute_data);
- FcDefaultSubstitute (pattern);
if (FcPatternGet (pattern, FC_DPI, 0, &v) == FcResultNoMatch)
FcPatternAddDouble (pattern, FC_DPI, ft2fontmap->dpi_y);
+ FcDefaultSubstitute (pattern);
}
static PangoFcFont *