From 32536a7b794c38ff1944b8af5e56e8962e76c311 Mon Sep 17 00:00:00 2001 From: Brian Ewins Date: Tue, 6 Mar 2007 23:45:23 +0000 Subject: [PATCH] [atsui] clean up warnings Just tidying up warnings left behind by previous fixes. --- src/cairo-atsui-font.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/cairo-atsui-font.c b/src/cairo-atsui-font.c index cf02a5ccd..d9fbde317 100644 --- a/src/cairo-atsui-font.c +++ b/src/cairo-atsui-font.c @@ -203,17 +203,17 @@ CreateSizedCopyOfStyle(ATSUStyle inStyle, const cairo_matrix_t *scale) double xscale = 1.0; double yscale = 1.0; CGAffineTransform theTransform; + Fixed theSize; + const ATSUAttributeTag theFontStyleTags[] = { kATSUSizeTag, kATSUFontMatrixTag }; + const ByteCount theFontStyleSizes[] = { sizeof(Fixed), sizeof(CGAffineTransform) }; + ATSUAttributeValuePtr theFontStyleValues[] = { &theSize, &theTransform }; + /* Set the style's size */ _cairo_matrix_compute_scale_factors(scale, &xscale, &yscale, 1); theTransform = CGAffineTransformMake(1.0, 0, 0, yscale/xscale, 0, 0); - - /* Set the style's size */ - Fixed theSize = FloatToFixed(xscale); - const ATSUAttributeTag theFontStyleTags[] = { kATSUSizeTag, kATSUFontMatrixTag }; - const ByteCount theFontStyleSizes[] = { sizeof(Fixed), sizeof(CGAffineTransform) }; - ATSUAttributeValuePtr theFontStyleValues[] = { &theSize, &theTransform }; + theSize = FloatToFixed(xscale); err = ATSUCreateAndCopyStyle(inStyle, &style); @@ -930,7 +930,6 @@ _cairo_atsui_font_old_show_glyphs (void *abstract_font, void *extra = NULL; cairo_bool_t can_draw_directly; cairo_rectangle_int16_t rect; - cairo_quartz_surface_t *surface = (cairo_quartz_surface_t *)generic_surface; ATSFontRef atsFont; CGFontRef cgFont;