From 60d86bcba76f5c19095153b959ab88cfd575f2a2 Mon Sep 17 00:00:00 2001 From: ellson Date: Fri, 11 Feb 2011 18:32:21 +0000 Subject: [PATCH] pango_cairo_context_set_resolution() seems cleaner that pango_cairo_font_map_set_resolution() --- contrib/pangotest/pangotest.c | 3 +-- plugin/pango/gvtextlayout_pango.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/contrib/pangotest/pangotest.c b/contrib/pangotest/pangotest.c index 0445ad881..3038c1538 100644 --- a/contrib/pangotest/pangotest.c +++ b/contrib/pangotest/pangotest.c @@ -25,7 +25,6 @@ static void draw_text(cairo_t *cr, char *text, char *font_family, double font_si if (!context) { fontmap = pango_cairo_font_map_new(); - pango_cairo_font_map_set_resolution(PANGO_CAIRO_FONT_MAP(fontmap),FONT_DPI); context = pango_font_map_create_context (fontmap); options=cairo_font_options_create(); cairo_font_options_set_antialias(options,CAIRO_ANTIALIAS_GRAY); @@ -33,7 +32,7 @@ static void draw_text(cairo_t *cr, char *text, char *font_family, double font_si cairo_font_options_set_hint_metrics(options,CAIRO_HINT_METRICS_ON); cairo_font_options_set_subpixel_order(options,CAIRO_SUBPIXEL_ORDER_BGR); pango_cairo_context_set_font_options(context, options); -// pango_cairo_context_set_resolution(context, FONT_DPI); + pango_cairo_context_set_resolution(context, FONT_DPI); cairo_font_options_destroy(options); g_object_unref(fontmap); } diff --git a/plugin/pango/gvtextlayout_pango.c b/plugin/pango/gvtextlayout_pango.c index d3a8c9618..49e910ed6 100644 --- a/plugin/pango/gvtextlayout_pango.c +++ b/plugin/pango/gvtextlayout_pango.c @@ -83,7 +83,6 @@ static boolean pango_textlayout(textpara_t * para, char **fontpath) if (!context) { fontmap = pango_cairo_font_map_new(); - pango_cairo_font_map_set_resolution(PANGO_CAIRO_FONT_MAP(fontmap),FONT_DPI); context = pango_cairo_font_map_create_context (PANGO_CAIRO_FONT_MAP(fontmap)); options=cairo_font_options_create(); cairo_font_options_set_antialias(options,CAIRO_ANTIALIAS_GRAY); @@ -91,6 +90,7 @@ static boolean pango_textlayout(textpara_t * para, char **fontpath) cairo_font_options_set_hint_metrics(options,CAIRO_HINT_METRICS_ON); cairo_font_options_set_subpixel_order(options,CAIRO_SUBPIXEL_ORDER_BGR); pango_cairo_context_set_font_options(context, options); + pango_cairo_context_set_resolution(context, FONT_DPI); cairo_font_options_destroy(options); g_object_unref(fontmap); } -- 2.40.0