From 4a46c715564c886e7434d65625fb84b5d87c0970 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 4 May 2010 18:51:30 +0100 Subject: [PATCH] type3: Minor tweaks to remove a redundant check. --- src/cairo-type3-glyph-surface.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/cairo-type3-glyph-surface.c b/src/cairo-type3-glyph-surface.c index 15cfaddd4..74257d4bf 100644 --- a/src/cairo-type3-glyph-surface.c +++ b/src/cairo-type3-glyph-surface.c @@ -430,7 +430,6 @@ _cairo_type3_glyph_surface_analyze_glyph (void *abstract_surface, _cairo_scaled_font_freeze_cache (surface->scaled_font); status = _cairo_scaled_glyph_lookup (surface->scaled_font, glyph_index, - CAIRO_SCALED_GLYPH_INFO_METRICS | CAIRO_SCALED_GLYPH_INFO_RECORDING_SURFACE, &scaled_glyph); @@ -447,10 +446,7 @@ _cairo_type3_glyph_surface_analyze_glyph (void *abstract_surface, if (unlikely (status)) goto cleanup; - status2 = _cairo_pdf_operators_flush (&surface->pdf_operators); - if (status == CAIRO_STATUS_SUCCESS) - status = status2; - + status = _cairo_pdf_operators_flush (&surface->pdf_operators); if (status == CAIRO_INT_STATUS_IMAGE_FALLBACK) status = CAIRO_STATUS_SUCCESS; @@ -507,7 +503,7 @@ _cairo_type3_glyph_surface_emit_glyph (void *abstract_surface, status2 = cairo_matrix_invert (&font_matrix_inverse); /* The invertability of font_matrix is tested in - * pdf_operators_show_glyphs before any glyphs are mappped to the + * pdf_operators_show_glyphs before any glyphs are mapped to the * subset. */ assert (status2 == CAIRO_STATUS_SUCCESS);