From e8e23862333f4be69e2afd9ee41c9a27817f9659 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 28 May 2008 19:10:09 -0400 Subject: [PATCH] Remove some bogus XXX marks These are all perfectly correct code. Most are simply there because when we support vertical text writing mode we need to update there, but that's pretty trivial. No special markers needed. /me is trying to make user-font clean of XXX and TODO marks --- src/cairo-arc.c | 1 - src/cairo-ft-font.c | 2 +- src/cairo-scaled-font.c | 4 ++-- src/cairo-user-font.c | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/cairo-arc.c b/src/cairo-arc.c index eed75e715..2b368099e 100644 --- a/src/cairo-arc.c +++ b/src/cairo-arc.c @@ -190,7 +190,6 @@ _cairo_arc_in_direction (cairo_t *cr, /* Recurse if drawing arc larger than pi */ if (angle_max - angle_min > M_PI) { double angle_mid = angle_min + (angle_max - angle_min) / 2.0; - /* XXX: Something tells me this block could be condensed. */ if (dir == CAIRO_DIRECTION_FORWARD) { _cairo_arc_in_direction (cr, xc, yc, radius, angle_min, angle_mid, diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c index 649aad057..3e3f2a27d 100644 --- a/src/cairo-ft-font.c +++ b/src/cairo-ft-font.c @@ -601,7 +601,7 @@ _compute_transform (cairo_ft_font_transform_t *sf, status = _cairo_matrix_compute_scale_factors (scale, &x_scale, &y_scale, - /* XXX */ 1); + 1); if (status) return status; diff --git a/src/cairo-scaled-font.c b/src/cairo-scaled-font.c index e401f8f30..33ee9afa9 100644 --- a/src/cairo-scaled-font.c +++ b/src/cairo-scaled-font.c @@ -675,7 +675,7 @@ _cairo_scaled_font_set_metrics (cairo_scaled_font_t *scaled_font, status = _cairo_matrix_compute_scale_factors (&scaled_font->font_matrix, &font_scale_x, &font_scale_y, - /* XXX */ 1); + 1); if (status) return status; @@ -1957,7 +1957,7 @@ _cairo_scaled_glyph_lookup (cairo_scaled_font_t *scaled_font, } _cairo_scaled_glyph_set_index(scaled_glyph, index); - scaled_glyph->cache_entry.size = 1; /* XXX */ + scaled_glyph->cache_entry.size = 1; /* We currently don't differentiate on glyph size at all */ scaled_glyph->scaled_font = scaled_font; scaled_glyph->surface = NULL; scaled_glyph->path = NULL; diff --git a/src/cairo-user-font.c b/src/cairo-user-font.c index 887e37a29..5fac36822 100644 --- a/src/cairo-user-font.c +++ b/src/cairo-user-font.c @@ -127,7 +127,7 @@ _cairo_user_scaled_glyph_init (void *abstract_font, * representation. */ matrix = scaled_font->base.scale_inverse; - status = _cairo_matrix_compute_scale_factors (&matrix, &x_scale, &y_scale, /* XXX */ 1); + status = _cairo_matrix_compute_scale_factors (&matrix, &x_scale, &y_scale, 1); if (status) return status; @@ -356,7 +356,7 @@ _cairo_user_font_face_scaled_font_create (void *abstract_ user_scaled_font->default_glyph_extents.width = 0.; user_scaled_font->default_glyph_extents.height = font_extents.ascent + font_extents.descent; user_scaled_font->default_glyph_extents.x_advance = font_extents.max_x_advance; - user_scaled_font->default_glyph_extents.y_advance = 0.; /* XXX */ + user_scaled_font->default_glyph_extents.y_advance = 0.; *scaled_font = &user_scaled_font->base; }