From 4e1024114872a01fef01ec0b9136e09f4613e5d2 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 28 May 2008 17:12:51 -0400 Subject: [PATCH] Fix whitespace --- src/cairo-mutex-type-private.h | 8 ++++---- src/cairo-svg-surface.c | 2 +- src/cairo-types-private.h | 4 ++-- src/cairo-xlib-surface.c | 24 ++++++++++++------------ src/cairo.h | 16 ++++++++-------- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/cairo-mutex-type-private.h b/src/cairo-mutex-type-private.h index 3dc5f4981..0b258db7f 100644 --- a/src/cairo-mutex-type-private.h +++ b/src/cairo-mutex-type-private.h @@ -75,9 +75,9 @@ # define CAIRO_MUTEX_IMPL_INITIALIZE() do { \ if (!_cairo_mutex_initialized) \ _cairo_mutex_initialize (); \ - } while(0) + } while(0) - /* and make sure we implement the above */ +/* and make sure we implement the above */ # define _CAIRO_MUTEX_IMPL_USE_STATIC_INITIALIZER 1 # endif /* CAIRO_MUTEX_IMPL_INITIALIZE */ @@ -105,9 +105,9 @@ # define CAIRO_MUTEX_IMPL_FINALIZE() do { \ if (_cairo_mutex_initialized) \ _cairo_mutex_finalize (); \ - } while(0) + } while(0) - /* and make sure we implement the above */ +/* and make sure we implement the above */ # define _CAIRO_MUTEX_IMPL_USE_STATIC_FINALIZER 1 # endif /* CAIRO_MUTEX_IMPL_FINALIZE */ diff --git a/src/cairo-svg-surface.c b/src/cairo-svg-surface.c index e5e691bc5..93e82bcbc 100644 --- a/src/cairo-svg-surface.c +++ b/src/cairo-svg-surface.c @@ -2202,7 +2202,7 @@ _cairo_svg_surface_show_glyphs (void *abstract_surface, return CAIRO_STATUS_SUCCESS; FALLBACK: - _cairo_path_fixed_init (&path); + _cairo_path_fixed_init (&path); status = _cairo_scaled_font_glyph_path (scaled_font,(cairo_glyph_t *) glyphs, num_glyphs, &path); diff --git a/src/cairo-types-private.h b/src/cairo-types-private.h index 45c158bfe..1b757905c 100644 --- a/src/cairo-types-private.h +++ b/src/cairo-types-private.h @@ -130,8 +130,8 @@ typedef enum _cairo_paginated_mode { } cairo_paginated_mode_t; /* Sure wish C had a real enum type so that this would be distinct - from cairo_status_t. Oh well, without that, I'll use this bogus 1000 - offset */ + * from cairo_status_t. Oh well, without that, I'll use this bogus 1000 + * offset */ typedef enum _cairo_int_status { CAIRO_INT_STATUS_DEGENERATE = 1000, CAIRO_INT_STATUS_UNSUPPORTED, diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c index 766102c37..b1069523c 100644 --- a/src/cairo-xlib-surface.c +++ b/src/cairo-xlib-surface.c @@ -2727,10 +2727,10 @@ cairo_xlib_surface_get_height (cairo_surface_t *abstract_surface) } enum { - GLYPHSET_INDEX_ARGB32, - GLYPHSET_INDEX_A8, - GLYPHSET_INDEX_A1, - NUM_GLYPHSETS + GLYPHSET_INDEX_ARGB32, + GLYPHSET_INDEX_A8, + GLYPHSET_INDEX_A1, + NUM_GLYPHSETS }; typedef struct _cairo_xlib_font_glyphset_free_glyphs { @@ -2870,14 +2870,14 @@ _cairo_xlib_render_free_glyphs (Display *dpy, static cairo_xlib_font_glyphset_info_t * _cairo_xlib_scaled_glyph_get_glyphset_info (cairo_scaled_glyph_t *scaled_glyph) { - return scaled_glyph->surface_private; + return scaled_glyph->surface_private; } static void _cairo_xlib_scaled_glyph_set_glyphset_info (cairo_scaled_glyph_t *scaled_glyph, cairo_xlib_font_glyphset_info_t *glyphset_info) { - scaled_glyph->surface_private = glyphset_info; + scaled_glyph->surface_private = glyphset_info; } static void @@ -3208,13 +3208,13 @@ typedef void (*cairo_xrender_composite_text_func_t) * an input glyph with double coordinates, and as "working" glyph with * integer from-current-point offsets. */ typedef union { - cairo_glyph_t d; - unsigned long index; - struct { + cairo_glyph_t d; unsigned long index; - int x; - int y; - } i; + struct { + unsigned long index; + int x; + int y; + } i; } cairo_xlib_glyph_t; /* compile-time assert that #cairo_xlib_glyph_t is the same size as #cairo_glyph_t */ diff --git a/src/cairo.h b/src/cairo.h index 179c45fa8..3e21e277b 100644 --- a/src/cairo.h +++ b/src/cairo.h @@ -817,9 +817,9 @@ typedef struct _cairo_font_face cairo_font_face_t; * with respect to the overall origin **/ typedef struct { - unsigned long index; - double x; - double y; + unsigned long index; + double x; + double y; } cairo_glyph_t; /** @@ -916,9 +916,9 @@ typedef struct { * Specifies variants of a font face based on their slant. **/ typedef enum _cairo_font_slant { - CAIRO_FONT_SLANT_NORMAL, - CAIRO_FONT_SLANT_ITALIC, - CAIRO_FONT_SLANT_OBLIQUE + CAIRO_FONT_SLANT_NORMAL, + CAIRO_FONT_SLANT_ITALIC, + CAIRO_FONT_SLANT_OBLIQUE } cairo_font_slant_t; /** @@ -929,8 +929,8 @@ typedef enum _cairo_font_slant { * Specifies variants of a font face based on their weight. **/ typedef enum _cairo_font_weight { - CAIRO_FONT_WEIGHT_NORMAL, - CAIRO_FONT_WEIGHT_BOLD + CAIRO_FONT_WEIGHT_NORMAL, + CAIRO_FONT_WEIGHT_BOLD } cairo_font_weight_t; /**