summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--pango/pangoft2-fontmap.c10
2 files changed, 16 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 892170a9..8fa60528 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-24 Behdad Esfahbod <behdad@gnome.org>
+
+ * pango/pangoft2-fontmap.c (pango_ft2_font_map_class_init),
+ (pango_ft2_font_map_get_resolution): Implement get_resolution for FT2
+ fontmaps.
+
2006-10-18 Behdad Esfahbod <behdad@gnome.org>
* modules/arabic/arabic-lang.c: Do not include arabic-ot.h.
diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c
index aee61af1..333e00bf 100644
--- a/pango/pangoft2-fontmap.c
+++ b/pango/pangoft2-fontmap.c
@@ -66,6 +66,8 @@ static void pango_ft2_font_map_default_substitute (PangoFcFontMap
FcPattern *pattern);
static PangoFcFont * pango_ft2_font_map_new_font (PangoFcFontMap *fcfontmap,
FcPattern *pattern);
+static double pango_ft2_font_map_get_resolution (PangoFcFontMap *fcfontmap,
+ PangoContext *context);
static PangoFT2FontMap *pango_ft2_global_fontmap = NULL;
@@ -80,6 +82,7 @@ pango_ft2_font_map_class_init (PangoFT2FontMapClass *class)
gobject_class->finalize = pango_ft2_font_map_finalize;
fcfontmap_class->default_substitute = pango_ft2_font_map_default_substitute;
fcfontmap_class->new_font = pango_ft2_font_map_new_font;
+ fcfontmap_class->get_resolution = pango_ft2_font_map_get_resolution;
}
static void
@@ -337,6 +340,13 @@ pango_ft2_font_map_default_substitute (PangoFcFontMap *fcfontmap,
FcDefaultSubstitute (pattern);
}
+static double
+pango_ft2_font_map_get_resolution (PangoFcFontMap *fcfontmap,
+ PangoContext *context)
+{
+ return ((PangoFT2FontMap *)fcfontmap)->dpi_y;
+}
+
static PangoFcFont *
pango_ft2_font_map_new_font (PangoFcFontMap *fcfontmap,
FcPattern *pattern)