[cairo-commit] 2 commits - src/cairo-image-surface.c src/cairo-xlib-screen.c

[Behdad Esfahbod]

 src/cairo-image-surface.c |   12 +++++++++++-
 src/cairo-xlib-screen.c   |    1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
diff-tree 7224e1a6e6eb474a3809d07f9540c959b3da10b2 (from 57434e249aba93f3b478a3c701e260093711d13f)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Apr 12 17:54:32 2007 -0400

    [image] Set hint-metrics on in default font options

diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c
index 5a04b1a..3aa4cb4 100644
--- a/src/cairo-image-surface.c
+++ b/src/cairo-image-surface.c
@@ -1062,6 +1062,15 @@ _cairo_image_surface_get_extents (void		
     return CAIRO_STATUS_SUCCESS;
 }
 
+static void
+_cairo_image_surface_get_font_options (void                  *abstract_surface,
+				       cairo_font_options_t  *options)
+{
+    _cairo_font_options_init_default (options);
+
+    cairo_font_options_set_hint_metrics (options, CAIRO_HINT_METRICS_ON);
+}
+
 /**
  * _cairo_surface_is_image:
  * @surface: a #cairo_surface_t
@@ -1093,7 +1102,8 @@ const cairo_surface_backend_t cairo_imag
     _cairo_image_surface_set_clip_region,
     NULL, /* intersect_clip_path */
     _cairo_image_surface_get_extents,
-    NULL /* old_show_glyphs */
+    NULL, /* old_show_glyphs */
+    _cairo_image_surface_get_font_options
 };
 
 /* A convenience function for when one needs to coerce an image
diff-tree 57434e249aba93f3b478a3c701e260093711d13f (from 8a4c108a4be6c4650cefe80e68d4c9974ccc27ba)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Apr 12 17:45:33 2007 -0400

    [xlib] Turn metrics-hinting on by default

diff --git a/src/cairo-xlib-screen.c b/src/cairo-xlib-screen.c
index 4d64726..ef72d53 100644
--- a/src/cairo-xlib-screen.c
+++ b/src/cairo-xlib-screen.c
@@ -240,6 +240,7 @@ _cairo_xlib_init_screen_font_options (ca
     cairo_font_options_set_hint_style (&info->font_options, hint_style);
     cairo_font_options_set_antialias (&info->font_options, antialias);
     cairo_font_options_set_subpixel_order (&info->font_options, subpixel_order);
+    cairo_font_options_set_hint_metrics (&info->font_options, CAIRO_HINT_METRICS_ON);
 }
 
 static cairo_xlib_screen_info_t *_cairo_xlib_screen_list = NULL;