pango_cairo_context_set_resolution() seems cleaner that pango_cairo_font_map_set_reso...

diff --git a/contrib/pangotest/pangotest.c b/contrib/pangotest/pangotest.c
index 0445ad881cdaf89fd12511c2b7c28a72711e9699..3038c15385c600bd4b762ce079035a344e2174f7 100644 (file)
--- 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 d3a8c961892ca572bba2bf4f2f13b0787eff24b7..49e910ed6d2a67dc6150a57f0e5acd91abae850e 100644 (file)
--- 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);
     }