diff options
author | Eric Anholt <eric@anholt.net> | 2014-06-15 22:45:48 +0100 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2014-06-15 22:49:12 +0100 |
commit | c44bc9fab201873741134a27c7176946c95c7e36 (patch) | |
tree | 8574a645a48fabdf41d7bd6fb7ae32e55a1a3589 | |
parent | 79441c28d4788c828e4fe225391b4151853fc64f (diff) |
Fix up style for the text changes.
With this squashed in, Reviewed-by: Eric Anholt <eric@anholt.net>
-rw-r--r-- | src/uxa/uxa-accel.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/uxa/uxa-accel.c b/src/uxa/uxa-accel.c index 1142dd2c..8bfc193f 100644 --- a/src/uxa/uxa-accel.c +++ b/src/uxa/uxa-accel.c @@ -1040,62 +1040,62 @@ fallback: #if HAS_GLAMOR_TEXT static int uxa_poly_text8(DrawablePtr drawable, GCPtr gc, - int x, int y, int count, char *chars) + int x, int y, int count, char *chars) { ScreenPtr screen = drawable->pScreen; uxa_screen_t *uxa_screen = uxa_get_screen(screen); if (uxa_screen->info->flags & UXA_USE_GLAMOR) { - int final_pos; + int final_pos; - if (glamor_poly_text8_nf(drawable, gc, x, y, count, chars, &final_pos)) - return final_pos; - } - return miPolyText8(drawable, gc, x, y, count, chars); + if (glamor_poly_text8_nf(drawable, gc, x, y, count, chars, &final_pos)) + return final_pos; + } + return miPolyText8(drawable, gc, x, y, count, chars); } static int uxa_poly_text16(DrawablePtr drawable, GCPtr gc, - int x, int y, int count, unsigned short *chars) + int x, int y, int count, unsigned short *chars) { ScreenPtr screen = drawable->pScreen; uxa_screen_t *uxa_screen = uxa_get_screen(screen); if (uxa_screen->info->flags & UXA_USE_GLAMOR) { - int final_pos; + int final_pos; - if (glamor_poly_text16_nf(drawable, gc, x, y, count, chars, &final_pos)) - return final_pos; - } - return miPolyText16(drawable, gc, x, y, count, chars); + if (glamor_poly_text16_nf(drawable, gc, x, y, count, chars, &final_pos)) + return final_pos; + } + return miPolyText16(drawable, gc, x, y, count, chars); } static void uxa_image_text8(DrawablePtr drawable, GCPtr gc, - int x, int y, int count, char *chars) + int x, int y, int count, char *chars) { ScreenPtr screen = drawable->pScreen; uxa_screen_t *uxa_screen = uxa_get_screen(screen); if (uxa_screen->info->flags & UXA_USE_GLAMOR) { - if (glamor_image_text8_nf(drawable, gc, x, y, count, chars)) - return; - } - miImageText8(drawable, gc, x, y, count, chars); + if (glamor_image_text8_nf(drawable, gc, x, y, count, chars)) + return; + } + miImageText8(drawable, gc, x, y, count, chars); } static void uxa_image_text16(DrawablePtr drawable, GCPtr gc, - int x, int y, int count, unsigned short *chars) + int x, int y, int count, unsigned short *chars) { ScreenPtr screen = drawable->pScreen; uxa_screen_t *uxa_screen = uxa_get_screen(screen); if (uxa_screen->info->flags & UXA_USE_GLAMOR) { - if (glamor_image_text16_nf(drawable, gc, x, y, count, chars)) - return; - } - miImageText16(drawable, gc, x, y, count, chars); + if (glamor_image_text16_nf(drawable, gc, x, y, count, chars)) + return; + } + miImageText16(drawable, gc, x, y, count, chars); } #endif |