back out the FONT_DPI / POINTS_PER_INCH changes that gave incorrect results

diff --git a/plugin/pango/gvrender_pango.c b/plugin/pango/gvrender_pango.c
index cf5bebe53ed31cdf38a1938a64a70b606097f336..34e3eae9dc3efdf5d9cd9f46530cac29d38bcdf6 100644 (file)
--- a/plugin/pango/gvrender_pango.c
+++ b/plugin/pango/gvrender_pango.c
@@ -230,7 +230,7 @@ static void cairogen_textpara(GVJ_t * job, pointf p, textpara_t * para)
 
     cairo_move_to (cr, p.x, -p.y);
     cairo_save(cr);
-    cairo_scale(cr, FONT_DPI / POINTS_PER_INCH, FONT_DPI / POINTS_PER_INCH);
+    cairo_scale(cr, POINTS_PER_INCH / FONT_DPI, POINTS_PER_INCH / FONT_DPI);
     pango_cairo_show_layout(cr, (PangoLayout*)(para->layout));
     cairo_restore(cr);
 }

diff --git a/plugin/pango/gvtextlayout_pango.c b/plugin/pango/gvtextlayout_pango.c
index 9b54ca7f50535eb20f274929a477db380ef64233..7a0fb01dad640c21eaabb2a8255e9907bc714836 100644 (file)
--- a/plugin/pango/gvtextlayout_pango.c
+++ b/plugin/pango/gvtextlayout_pango.c
@@ -19,8 +19,6 @@
 #include <string.h>
 #include "gvplugin_textlayout.h"
 
-#include "gvplugin_pango.h"
-
 #ifdef HAVE_PANGOCAIRO
 #include <pango/pangocairo.h>
 #ifdef HAVE_PANGO_FC_FONT_LOCK_FACE
@@ -54,6 +52,8 @@ static char* pango_psfontResolve (PostscriptAlias* pa)
     return buf;
 }
 
+#define FONT_DPI 96.
+
 #define ENABLE_PANGO_MARKUP
 #ifdef ENABLE_PANGO_MARKUP
 #define FULL_MARKUP "<span weight=\"bold\" style=\"italic\" underline=\"single\"></span>"
@@ -85,7 +85,6 @@ static boolean pango_textlayout(textpara_t * para, char **fontpath)
        fontmap = pango_cairo_font_map_get_default();
        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));
-       pango_cairo_context_set_resolution(context,FONT_DPI);
        options=cairo_font_options_create();
        cairo_font_options_set_antialias(options,CAIRO_ANTIALIAS_GRAY);
        cairo_font_options_set_hint_style(options,CAIRO_HINT_STYLE_FULL);
@@ -218,13 +217,13 @@ static boolean pango_textlayout(textpara_t * para, char **fontpath)
     if (logical_rect.width == 0)
        logical_rect.height = 0;
 
-    textlayout_scale = FONT_DPI / (POINTS_PER_INCH * PANGO_SCALE);
+    textlayout_scale = POINTS_PER_INCH / (FONT_DPI * PANGO_SCALE);
     para->width = (int)(logical_rect.width * textlayout_scale + 1);    /* round up so that width/height are never too small */
     para->height = (int)(logical_rect.height * textlayout_scale + 1);
 
     /* The y offset from baseline to 0,0 of the bitmap representation */
     iter = pango_layout_get_iter (layout);
-    para->yoffset_layout = pango_layout_iter_get_baseline (iter) * POINTS_PER_INCH/(FONT_DPI * PANGO_SCALE);
+    para->yoffset_layout = pango_layout_iter_get_baseline (iter) * textlayout_scale;
 
     /* The distance below midline for y centering of text strings */
     para->yoffset_centerline = 0.10 * para->fontsize;