diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2006-02-06 15:44:37 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-02-06 15:44:37 +0000 |
| commit | 75235308b9d8d30e72428627f345bcbf09641e5b (patch) | |
| tree | a081a50f43a21493f43afaa03f9a7a4a2af9798c /pango | |
| parent | 522ce4d5b39e325471edf77cea9ad15ed98505af (diff) | |
| download | pango-PANGO_1_11_4.tar.gz | |
As cairo 1.2 seems to be delayed infinitely, make all cairo HEAD API thatPANGO_1_11_4
2006-02-06 Behdad Esfahbod <behdad@gnome.org>
As cairo 1.2 seems to be delayed infinitely, make all cairo HEAD
API that we use conditional, to make a release.
* configure.in: Depend on cairo 1.0.0 again. Check for
cairo_scaled_font_get_*() and cairo_scaled_font_text_extents()
availability.
* pango/pangocairo-font.c: Work around if the above functions are not
available.
Diffstat (limited to 'pango')
| -rw-r--r-- | pango/pangocairo-font.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/pango/pangocairo-font.c b/pango/pangocairo-font.c index 99e2d930..ef03d68a 100644 --- a/pango/pangocairo-font.c +++ b/pango/pangocairo-font.c @@ -133,6 +133,10 @@ _pango_cairo_font_get_hex_box_info (PangoCairoFont *cfont) cairo_font_extents_t font_extents; PangoFontDescription *mini_desc, *desc; cairo_scaled_font_t *scaled_font, *scaled_mini_font; +#ifndef HAVE_CAIRO_SCALED_FONT_TEXT_EXTENTS + cairo_surface_t *surface; + cairo_t *cr; +#endif if (!cfont) return NULL; @@ -143,6 +147,7 @@ _pango_cairo_font_get_hex_box_info (PangoCairoFont *cfont) scaled_font = _pango_cairo_font_get_scaled_font (cfont); +#ifdef HAVE_CAIRO_SCALED_FONT_GETTERS /* prepare for some hinting */ { cairo_matrix_t ctm; @@ -159,6 +164,9 @@ _pango_cairo_font_get_hex_box_info (PangoCairoFont *cfont) scale_y = sqrt (x*x + y*y); scale_y_inv = 1 / scale_y; } +#else + scale_x = scale_x_inv = scale_y = scale_y_inv = 1.0; +#endif /* we hint to the nearest device units */ #define HINT(value, scale, scale_inv) (ceil ((value-1e-5) * scale) * scale_inv) @@ -214,16 +222,30 @@ _pango_cairo_font_get_hex_box_info (PangoCairoFont *cfont) mini_cfont = (PangoCairoFont *) mini_font; scaled_mini_font = _pango_cairo_font_get_scaled_font (mini_cfont); +#ifndef HAVE_CAIRO_SCALED_FONT_TEXT_EXTENTS + surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, 1, 1); + cr = cairo_create (surface); + cairo_surface_destroy (surface); + _pango_cairo_font_install (mini_cfont, cr); +#endif + for (i = 0 ; i < 16 ; i++) { cairo_text_extents_t extents; c[0] = hexdigits[i]; +#ifdef HAVE_CAIRO_SCALED_FONT_TEXT_EXTENTS cairo_scaled_font_text_extents (scaled_mini_font, c, &extents); +#else + cairo_text_extents (cr, c, &extents); +#endif width = MAX (width, extents.width); height = MAX (height, extents.height); } +#ifndef HAVE_CAIRO_SCALED_FONT_TEXT_EXTENTS + cairo_destroy (cr); +#endif cairo_scaled_font_extents (scaled_font, &font_extents); hbi = g_slice_new (PangoCairoHexBoxInfo); |