diff options
| author | Benjamin Otte <otte@redhat.com> | 2010-02-23 21:54:17 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2010-04-23 23:30:09 +0200 |
| commit | 14abc50fd6f9b9b282e3f9ae604a492d545957f4 (patch) | |
| tree | 1dc32d8aa4bda18a005a7e8124daf181cb230b49 | |
| parent | 30d1696faf839cbd769c36524c827ffa019a7915 (diff) | |
scaled-font: Make code not complain about every new format
| -rw-r--r-- | src/cairo-scaled-font.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/cairo-scaled-font.c b/src/cairo-scaled-font.c index f7371f07..ec6122ef 100644 --- a/src/cairo-scaled-font.c +++ b/src/cairo-scaled-font.c @@ -2142,16 +2142,11 @@ _cairo_scaled_font_show_glyphs (cairo_scaled_font_t *scaled_font, { cairo_surface_t *new_mask; - switch (glyph_surface->format) { - case CAIRO_FORMAT_ARGB32: - case CAIRO_FORMAT_A8: - case CAIRO_FORMAT_A1: + if (glyph_surface->format == CAIRO_FORMAT_ARGB32 || + glyph_surface->format == CAIRO_FORMAT_A8 || + glyph_surface->format == CAIRO_FORMAT_A1) { mask_format = glyph_surface->format; - break; - case CAIRO_FORMAT_RGB16_565: - case CAIRO_FORMAT_RGB24: - case CAIRO_FORMAT_INVALID: - default: + } else { ASSERT_NOT_REACHED; mask_format = CAIRO_FORMAT_ARGB32; break; |