From ef10a0403a8a466199615e34a34df9ea860ef9c0 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 6 Jun 2006 15:50:33 -0700 Subject: Remove initial, final, and duplicate blank lines. This patch was produced by running git-stripspace on all *.[ch] files within cairo. Note that this script would have also created all the changes from the previous commits to remove trailing whitespace. --- src/cairo-analysis-surface.c | 2 -- src/cairo-array.c | 1 - src/cairo-atsui-font.c | 6 ------ src/cairo-base85-stream.c | 1 - src/cairo-beos.h | 1 - src/cairo-cache.c | 2 -- src/cairo-clip.c | 2 -- src/cairo-debug.c | 1 - src/cairo-directfb-surface.c | 11 ----------- src/cairo-directfb.h | 9 --------- src/cairo-font-subset-private.h | 1 - src/cairo-font-subset.c | 2 -- src/cairo-ft-font.c | 1 - src/cairo-glitz-surface.c | 1 - src/cairo-matrix.c | 3 --- src/cairo-output-stream.c | 2 -- src/cairo-path-fill.c | 1 - src/cairo-path.c | 1 - src/cairo-pdf-surface.c | 2 -- src/cairo-pdf-test.h | 1 - src/cairo-png.c | 1 - src/cairo-ps-surface.c | 1 - src/cairo-quartz-surface.c | 1 - src/cairo-quartz.h | 1 - src/cairo-region.c | 1 - src/cairo-scaled-font-subsets.c | 1 - src/cairo-scaled-font.c | 1 - src/cairo-slope.c | 4 ---- src/cairo-spline.c | 1 - src/cairo-stroke-style.c | 1 - src/cairo-svg-surface.c | 1 - src/cairo-traps.c | 1 - src/cairo-unicode.c | 3 --- src/cairo-win32-font.c | 3 --- src/cairo-win32-surface.c | 2 -- src/cairo-xcb-surface.c | 1 - src/cairo-xlib-surface.c | 3 --- src/cairo-xlib-test.h | 1 - src/cairo-xlib-xrender.h | 1 - src/cairo-xlib.h | 1 - src/cairo.c | 3 --- src/cairo.h | 3 --- src/cairoint.h | 4 ---- 43 files changed, 91 deletions(-) (limited to 'src') diff --git a/src/cairo-analysis-surface.c b/src/cairo-analysis-surface.c index d06e3fea..f8b3608e 100644 --- a/src/cairo-analysis-surface.c +++ b/src/cairo-analysis-surface.c @@ -255,5 +255,3 @@ _cairo_analysis_surface_has_unsupported (cairo_surface_t *abstract_surface) return surface->fallback; } - - diff --git a/src/cairo-array.c b/src/cairo-array.c index 49d764c1..baf17659 100644 --- a/src/cairo-array.c +++ b/src/cairo-array.c @@ -460,4 +460,3 @@ _cairo_user_data_array_set_data (cairo_user_data_array_t *array, return CAIRO_STATUS_SUCCESS; } - diff --git a/src/cairo-atsui-font.c b/src/cairo-atsui-font.c index e4bf30f6..1f6726e4 100644 --- a/src/cairo-atsui-font.c +++ b/src/cairo-atsui-font.c @@ -76,7 +76,6 @@ struct _cairo_atsui_font { ATSUFontID fontID; }; - struct _cairo_atsui_font_face { cairo_font_face_t base; ATSUFontID font_id; @@ -134,8 +133,6 @@ cairo_atsui_font_face_create_for_atsu_font_id (ATSUFontID font_id) return &font_face->base; } - - static CGAffineTransform CGAffineTransformMakeWithCairoFontScale(const cairo_matrix_t *scale) { @@ -327,7 +324,6 @@ _cairo_atsui_font_create_toy(cairo_toy_font_face_t *toy_face, sizeof(styleTags) / sizeof(styleTags[0]), styleTags, styleSizes, styleValues); - return _cairo_atsui_font_create_scaled (&toy_face->base, fontID, style, font_matrix, ctm, options, font_out); } @@ -682,7 +678,6 @@ _cairo_atsui_font_old_show_glyphs (void *abstract_font, * that we don't really need... */ - for (i = 0; i < num_glyphs; i++) { CGGlyph theGlyph = glyphs[i].index; @@ -717,4 +712,3 @@ const cairo_scaled_font_backend_t cairo_atsui_scaled_font_backend = { NULL, /* ucs4_to_index */ _cairo_atsui_font_old_show_glyphs, }; - diff --git a/src/cairo-base85-stream.c b/src/cairo-base85-stream.c index 42d732b2..d42700de 100644 --- a/src/cairo-base85-stream.c +++ b/src/cairo-base85-stream.c @@ -127,4 +127,3 @@ _cairo_base85_stream_create (cairo_output_stream_t *output) _cairo_base85_stream_close, stream); } - diff --git a/src/cairo-beos.h b/src/cairo-beos.h index d253bcb3..45a3d544 100644 --- a/src/cairo-beos.h +++ b/src/cairo-beos.h @@ -58,4 +58,3 @@ CAIRO_END_DECLS #endif /* CAIRO_HAS_BEOS_SURFACE */ #endif /* CAIRO_BEOS_H */ - diff --git a/src/cairo-cache.c b/src/cairo-cache.c index 3a7d5bee..feac8c77 100644 --- a/src/cairo-cache.c +++ b/src/cairo-cache.c @@ -57,7 +57,6 @@ static void _cairo_cache_shrink_to_accomodate (cairo_cache_t *cache, unsigned long additional); - static cairo_status_t _cairo_cache_init (cairo_cache_t *cache, cairo_cache_keys_equal_func_t keys_equal, @@ -379,4 +378,3 @@ _cairo_hash_string (const char *c) hash = ((hash << 5) + hash) + *c++; return hash; } - diff --git a/src/cairo-clip.c b/src/cairo-clip.c index 0e3e6faf..fff9558d 100644 --- a/src/cairo-clip.c +++ b/src/cairo-clip.c @@ -452,7 +452,6 @@ _cairo_clip_clip (cairo_clip_t *clip, if (status != CAIRO_INT_STATUS_UNSUPPORTED) return status; - _cairo_traps_init (&traps); status = _cairo_path_fixed_fill_to_traps (path, fill_rule, @@ -540,4 +539,3 @@ _cairo_clip_init_deep_copy (cairo_clip_t *clip, } } } - diff --git a/src/cairo-debug.c b/src/cairo-debug.c index cd0de787..7c299325 100644 --- a/src/cairo-debug.c +++ b/src/cairo-debug.c @@ -69,4 +69,3 @@ cairo_debug_reset_static_data (void) _cairo_ft_font_reset_static_data (); #endif } - diff --git a/src/cairo-directfb-surface.c b/src/cairo-directfb-surface.c index 46e8cc8f..80f0ff62 100644 --- a/src/cairo-directfb-surface.c +++ b/src/cairo-directfb-surface.c @@ -50,7 +50,6 @@ Composite support not working */ #define DFB_COMPOSITE 0 - #if DFB_SHOW_GLYPHS static cairo_int_status_t _cairo_directfb_surface_show_glyphs (cairo_scaled_font_t *scaled_font, @@ -80,7 +79,6 @@ typedef struct _cairo_directfb_surface { int height; } cairo_directfb_surface_t; - static int _dfb_set_operator (cairo_operator_t operator,IDirectFBSurface *dest) { @@ -137,7 +135,6 @@ _dfb_set_operator (cairo_operator_t operator,IDirectFBSurface *dest) return DFB_SUPPORTED; } - static inline int cairo_to_directfb_format(cairo_format_t format ) { switch( format ) { case CAIRO_FORMAT_RGB24: @@ -187,7 +184,6 @@ static inline int directfb_to_cairo_format(DFBSurfacePixelFormat dfbformat ) { } } - static IDirectFBSurface *cairo_directfb_buffer_surface_create(IDirectFB *dfb,void *data,int pitch, int format, int width, int height) { @@ -267,7 +263,6 @@ _cairo_directfb_surface_get_image (cairo_directfb_surface_t *surface, } surface->buffer->Unlock(surface->buffer); - surface->main_surface->GetSize(surface->main_surface,&width,&height); surface->main_surface->GetPixelFormat(surface->main_surface,&dfbformat); surface->format = directfb_to_cairo_format(dfbformat); @@ -318,7 +313,6 @@ _cairo_directfb_surface_get_image (cairo_directfb_surface_t *surface, return CAIRO_STATUS_SUCCESS; } - static cairo_surface_t * _cairo_directfb_surface_create_similar (void *abstract_src, cairo_content_t content, @@ -350,7 +344,6 @@ _cairo_directfb_surface_create_similar (void *abstract_src, return sur; } - static cairo_status_t _cairo_directfb_surface_finish (void *data ) { cairo_directfb_surface_t *surface=(cairo_directfb_surface_t *)data; @@ -660,7 +653,6 @@ _cairo_directfb_surface_scaled_glyph_fini (cairo_scaled_glyph_t *scaled_glyph, } #endif - static const cairo_surface_backend_t cairo_directfb_surface_backend = { CAIRO_SURFACE_TYPE_DIRECTFB, _cairo_directfb_surface_create_similar, @@ -782,8 +774,6 @@ _cairo_directfb_surface_show_glyphs (cairo_scaled_font_t *scaled_font, } #endif - - cairo_surface_t * cairo_directfb_surface_create (IDirectFB *dfb,IDirectFBSurface *dfbsurface) { @@ -804,4 +794,3 @@ cairo_directfb_surface_create (IDirectFB *dfb,IDirectFBSurface *dfbsurface) surface->clip=NULL; return ((cairo_surface_t *)surface); } - diff --git a/src/cairo-directfb.h b/src/cairo-directfb.h index 3b8e10d2..b7771967 100644 --- a/src/cairo-directfb.h +++ b/src/cairo-directfb.h @@ -47,14 +47,5 @@ cairo_surface_t * cairo_directfb_surface_create (IDirectFB *dfb,IDirectFBSurface CAIRO_END_DECLS - - #endif /*CAIRO_HAS_DIRECTFB_SURFACE*/ #endif /*CAIRO_DIRECTFB_H*/ - - - - - - - diff --git a/src/cairo-font-subset-private.h b/src/cairo-font-subset-private.h index 5b43f52d..4b9235bd 100644 --- a/src/cairo-font-subset-private.h +++ b/src/cairo-font-subset-private.h @@ -51,7 +51,6 @@ struct cairo_font_subset { long ascent, descent; }; - cairo_private int _cairo_font_subset_use_glyph (cairo_font_subset_t *font, int glyph); diff --git a/src/cairo-font-subset.c b/src/cairo-font-subset.c index 9d7aa405..ab7dc819 100644 --- a/src/cairo-font-subset.c +++ b/src/cairo-font-subset.c @@ -74,7 +74,6 @@ struct cairo_pdf_ft_font { static int cairo_pdf_ft_font_use_glyph (void *abstract_font, int glyph); - #define ARRAY_LENGTH(a) ( (sizeof (a)) / (sizeof ((a)[0])) ) #define SFNT_VERSION 0x00010000 @@ -335,7 +334,6 @@ cairo_pdf_ft_font_write_generic_table (cairo_pdf_ft_font_t *font, return 0; } - typedef struct composite_glyph composite_glyph_t; struct composite_glyph { unsigned short flags; diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c index 24ac1a73..002466bb 100644 --- a/src/cairo-ft-font.c +++ b/src/cairo-ft-font.c @@ -1471,7 +1471,6 @@ _cairo_ft_scaled_font_create (cairo_ft_unscaled_font_t *unscaled, fs_metrics.max_x_advance = face->max_advance_width / scale; } - /* FIXME: this doesn't do vertical layout atm. */ fs_metrics.max_y_advance = 0.0; diff --git a/src/cairo-glitz-surface.c b/src/cairo-glitz-surface.c index 0db3df9b..4c898f90 100644 --- a/src/cairo-glitz-surface.c +++ b/src/cairo-glitz-surface.c @@ -353,7 +353,6 @@ _cairo_glitz_surface_release_dest_image (void *abstract_surfa cairo_surface_destroy (&image->base); } - static cairo_status_t _cairo_glitz_surface_clone_similar (void *abstract_surface, cairo_surface_t *src, diff --git a/src/cairo-matrix.c b/src/cairo-matrix.c index 54c421df..a3ab6aa0 100644 --- a/src/cairo-matrix.c +++ b/src/cairo-matrix.c @@ -583,7 +583,6 @@ _cairo_matrix_is_integer_translation(const cairo_matrix_t *m, In other words, what is the maximum radius, MAX[ |X'| ], reached for any X on the unit circle ( |X| = 1 ) ? - 3. Some useful formulae (A) through (C) below are standard double-angle formulae. (D) is a lesser @@ -617,7 +616,6 @@ _cairo_matrix_is_integer_translation(const cairo_matrix_t *m, MAX[a*cos(θ) + b*sin(θ)] = (a² + b²)/sqrt(a² + b²) = sqrt(a² + b²) - 4. Derivation of maximum expansion To find MAX[ |X'| ] we search brute force method using calculus. The unit @@ -666,7 +664,6 @@ _cairo_matrix_is_integer_translation(const cairo_matrix_t *m, Which is the solution to this problem. - Walter Brisken 2004/10/08 diff --git a/src/cairo-output-stream.c b/src/cairo-output-stream.c index 077de9c2..5ef36e5f 100644 --- a/src/cairo-output-stream.c +++ b/src/cairo-output-stream.c @@ -213,7 +213,6 @@ _cairo_dtostr (char *buffer, size_t size, double d) return p + 1 - buffer; } - enum { LENGTH_MODIFIER_LONG = 0x100 }; @@ -327,7 +326,6 @@ _cairo_output_stream_get_status (cairo_output_stream_t *stream) return stream->status; } - /* Maybe this should be a configure time option, so embedded targets * don't have to pull in stdio. */ diff --git a/src/cairo-path-fill.c b/src/cairo-path-fill.c index f9b9d9f5..51e067f6 100644 --- a/src/cairo-path-fill.c +++ b/src/cairo-path-fill.c @@ -205,4 +205,3 @@ BAIL: return status; } - diff --git a/src/cairo-path.c b/src/cairo-path.c index 3c8c0b2e..420e2177 100644 --- a/src/cairo-path.c +++ b/src/cairo-path.c @@ -613,4 +613,3 @@ _cairo_path_fixed_offset (cairo_path_fixed_t *path, CAIRO_FIXED_ONE, CAIRO_FIXED_ONE); } - diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c index 9c5dea1a..bdbc11db 100644 --- a/src/cairo-pdf-surface.c +++ b/src/cairo-pdf-surface.c @@ -740,7 +740,6 @@ emit_smask (cairo_pdf_surface_t *surface, return status; } - /* Emit image data into the given surface, providing a resource that * can be used to reference the data in image_ret. */ static cairo_status_t @@ -829,7 +828,6 @@ emit_image (cairo_pdf_surface_t *surface, " /BitsPerComponent 8\r\n" \ " /Filter /FlateDecode\r\n" - if (need_smask) *image_ret = _cairo_pdf_surface_open_stream (surface, IMAGE_DICTIONARY diff --git a/src/cairo-pdf-test.h b/src/cairo-pdf-test.h index 7299be3a..6d0c93cf 100644 --- a/src/cairo-pdf-test.h +++ b/src/cairo-pdf-test.h @@ -52,4 +52,3 @@ CAIRO_END_DECLS #endif /* CAIRO_HAS_PDF_SURFACE */ #endif /* CAIRO_PDF_TEST_H */ - diff --git a/src/cairo-png.c b/src/cairo-png.c index 06c6efbe..d6560163 100644 --- a/src/cairo-png.c +++ b/src/cairo-png.c @@ -529,4 +529,3 @@ cairo_image_surface_create_from_png_stream (cairo_read_func_t read_func, return read_png (stream_read_func, &png_closure); } - diff --git a/src/cairo-ps-surface.c b/src/cairo-ps-surface.c index 9d491119..0149b14f 100644 --- a/src/cairo-ps-surface.c +++ b/src/cairo-ps-surface.c @@ -393,7 +393,6 @@ _cairo_ps_surface_create_for_stream_internal (cairo_output_stream_t *stream, width, height, &cairo_ps_surface_paginated_backend); - CLEANUP_OUTPUT_STREAM: _cairo_output_stream_destroy (surface->stream); CLEANUP_TMPFILE: diff --git a/src/cairo-quartz-surface.c b/src/cairo-quartz-surface.c index 5b55ac3d..a3237e31 100644 --- a/src/cairo-quartz-surface.c +++ b/src/cairo-quartz-surface.c @@ -225,7 +225,6 @@ static const struct _cairo_surface_backend cairo_quartz_surface_backend = { NULL /* old_show_glyphs */ }; - cairo_surface_t *cairo_quartz_surface_create(CGContextRef context, int width, int height, diff --git a/src/cairo-quartz.h b/src/cairo-quartz.h index b3072df7..286efe8b 100644 --- a/src/cairo-quartz.h +++ b/src/cairo-quartz.h @@ -58,4 +58,3 @@ CAIRO_END_DECLS #endif /* CAIRO_HAS_QUARTZ_SURFACE */ #endif /* CAIRO_QUARTZ_H */ - diff --git a/src/cairo-region.c b/src/cairo-region.c index be737411..88e89f22 100644 --- a/src/cairo-region.c +++ b/src/cairo-region.c @@ -80,4 +80,3 @@ _cairo_region_extents_rectangle (pixman_region16_t *region, rect->width = region_extents->x2 - region_extents->x1; rect->height = region_extents->y2 - region_extents->y1; } - diff --git a/src/cairo-scaled-font-subsets.c b/src/cairo-scaled-font-subsets.c index 9be2be28..112925cd 100644 --- a/src/cairo-scaled-font-subsets.c +++ b/src/cairo-scaled-font-subsets.c @@ -39,7 +39,6 @@ * Keith Packard */ - #include "cairoint.h" #include "cairo-scaled-font-subsets-private.h" diff --git a/src/cairo-scaled-font.c b/src/cairo-scaled-font.c index 06fbe11a..003af498 100644 --- a/src/cairo-scaled-font.c +++ b/src/cairo-scaled-font.c @@ -1009,7 +1009,6 @@ _scaled_glyph_path_curve_to (void *abstract_closure, p2->y + closure->offset.y); } - static cairo_status_t _scaled_glyph_path_close_path (void *abstract_closure) { diff --git a/src/cairo-slope.c b/src/cairo-slope.c index 5c4886fd..2c888e40 100644 --- a/src/cairo-slope.c +++ b/src/cairo-slope.c @@ -97,7 +97,3 @@ _cairo_slope_counter_clockwise (cairo_slope_t *a, cairo_slope_t *b) { return ! _cairo_slope_clockwise (a, b); } - - - - diff --git a/src/cairo-spline.c b/src/cairo-spline.c index 0da00aab..900d3ca0 100644 --- a/src/cairo-spline.c +++ b/src/cairo-spline.c @@ -283,4 +283,3 @@ _cairo_spline_decompose (cairo_spline_t *spline, double tolerance) return CAIRO_STATUS_SUCCESS; } - diff --git a/src/cairo-stroke-style.c b/src/cairo-stroke-style.c index 426dc8ae..a1509064 100644 --- a/src/cairo-stroke-style.c +++ b/src/cairo-stroke-style.c @@ -84,4 +84,3 @@ _cairo_stroke_style_fini (cairo_stroke_style_t *style) } style->num_dashes = 0; } - diff --git a/src/cairo-svg-surface.c b/src/cairo-svg-surface.c index b2a36fb0..6cdc9056 100644 --- a/src/cairo-svg-surface.c +++ b/src/cairo-svg-surface.c @@ -1779,7 +1779,6 @@ _cairo_svg_surface_get_font_options (void *abstract_surface, cairo_font_options_set_hint_metrics (options, CAIRO_HINT_METRICS_OFF); } - static const cairo_surface_backend_t cairo_svg_surface_backend = { CAIRO_SURFACE_TYPE_SVG, _cairo_svg_surface_create_similar, diff --git a/src/cairo-traps.c b/src/cairo-traps.c index 404461cb..58b5146d 100644 --- a/src/cairo-traps.c +++ b/src/cairo-traps.c @@ -549,7 +549,6 @@ _line_segs_intersect_ceil (cairo_line_t *l1, cairo_line_t *l2, cairo_fixed_t *y_ l2_det = _det16_32 (l2->p1.x, l2->p1.y, l2->p2.x, l2->p2.y); - num_det = _det32_64 (l1_det, _fixed_16_16_to_fixed_32_32 (dy1), l2_det, _fixed_16_16_to_fixed_32_32 (dy2)); diff --git a/src/cairo-unicode.c b/src/cairo-unicode.c index 22b0efb4..8f99e82e 100644 --- a/src/cairo-unicode.c +++ b/src/cairo-unicode.c @@ -85,7 +85,6 @@ ((Char) < 0x200000 ? 4 : \ ((Char) < 0x4000000 ? 5 : 6))))) - #define UTF8_GET(Result, Chars, Count, Mask, Len) \ (Result) = (Chars)[0] & (Mask); \ for ((Count) = 1; (Count) < (Len); ++(Count)) \ @@ -105,7 +104,6 @@ ((Char) < 0xFDD0 || (Char) > 0xFDEF) && \ ((Char) & 0xFFFE) != 0xFFFE) - static const char utf8_skip_data[256] = { 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, @@ -311,7 +309,6 @@ _cairo_utf8_to_utf16 (const unsigned char *str, in = UTF8_NEXT_CHAR (in); } - str16 = malloc (sizeof (uint16_t) * (n16 + 1)); if (!str16) return CAIRO_STATUS_NO_MEMORY; diff --git a/src/cairo-win32-font.c b/src/cairo-win32-font.c index df5c7589..144c3e14 100644 --- a/src/cairo-win32-font.c +++ b/src/cairo-win32-font.c @@ -192,7 +192,6 @@ _have_cleartype_quality (void) version_info.dwMinorVersion >= 1)); /* XP or newer */ } - static BYTE _get_system_quality (void) { @@ -1080,7 +1079,6 @@ _compute_a8_mask (cairo_win32_surface_t *mask_surface) return &image8->base; } - static cairo_status_t _cairo_win32_scaled_font_glyph_init (void *abstract_font, cairo_scaled_glyph_t *scaled_glyph, @@ -1443,7 +1441,6 @@ cairo_win32_font_face_create_for_logfontw (LOGFONTW *logfont) return &font_face->base; } - cairo_font_face_t * cairo_win32_font_face_create_for_hfont (HFONT font) { diff --git a/src/cairo-win32-surface.c b/src/cairo-win32-surface.c index 8976fee4..8a62df00 100644 --- a/src/cairo-win32-surface.c +++ b/src/cairo-win32-surface.c @@ -1051,7 +1051,6 @@ _cairo_win32_surface_show_glyphs (void *surface, else dx_buf[i] = (glyphs[i+1].x - glyphs[i].x) * WIN32_FONT_LOGICAL_SCALE; - if (i == num_glyphs - 1 || glyphs[i].y != glyphs[i+1].y) { const int offset = (i - output_count) + 1; win_result = ExtTextOutW(dst->dc, @@ -1194,7 +1193,6 @@ cairo_win32_surface_create_with_dib (cairo_format_t format, return _cairo_win32_surface_create_for_dc (NULL, format, width, height); } - /** * _cairo_surface_is_win32: * @surface: a #cairo_surface_t diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c index ed8d4987..2c1e669f 100644 --- a/src/cairo-xcb-surface.c +++ b/src/cairo-xcb-surface.c @@ -1326,4 +1326,3 @@ cairo_xcb_surface_set_size (cairo_surface_t *surface, xcb_surface->width = width; xcb_surface->height = height; } - diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c index 7c613b82..bc2525f9 100644 --- a/src/cairo-xlib-surface.c +++ b/src/cairo-xlib-surface.c @@ -136,7 +136,6 @@ struct _cairo_xlib_surface { #define CAIRO_SURFACE_RENDER_HAS_COMPOSITE(surface) CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 0) #define CAIRO_SURFACE_RENDER_HAS_COMPOSITE_TEXT(surface) CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 0) - #define CAIRO_SURFACE_RENDER_HAS_FILL_RECTANGLE(surface) CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 1) #define CAIRO_SURFACE_RENDER_HAS_FILL_RECTANGLES(surface) CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 1) @@ -1622,7 +1621,6 @@ _cairo_xlib_surface_composite_trapezoids (cairo_operator_t op, 0, 0, dst_x, dst_y, width, height); - } else { /* XXX: The XTrapezoid cast is evil and needs to go away somehow. */ XRenderCompositeTrapezoids (dst->dpy, @@ -2726,4 +2724,3 @@ _cairo_xlib_surface_show_glyphs (void *abstract_dst, _cairo_pattern_fini (&solid_pattern.base); return status; } - diff --git a/src/cairo-xlib-test.h b/src/cairo-xlib-test.h index fc06ce93..7ecb3ced 100644 --- a/src/cairo-xlib-test.h +++ b/src/cairo-xlib-test.h @@ -52,4 +52,3 @@ CAIRO_END_DECLS #endif /* CAIRO_HAS_XLIB_SURFACE */ #endif /* CAIRO_XLIB_H */ - diff --git a/src/cairo-xlib-xrender.h b/src/cairo-xlib-xrender.h index cc1064fc..f3b3726e 100644 --- a/src/cairo-xlib-xrender.h +++ b/src/cairo-xlib-xrender.h @@ -53,7 +53,6 @@ cairo_xlib_surface_create_with_xrender_format (Display *dpy, int width, int height); - CAIRO_END_DECLS #else /* CAIRO_HAS_XLIB_SURFACE */ diff --git a/src/cairo-xlib.h b/src/cairo-xlib.h index bff1c38d..f7802fd9 100644 --- a/src/cairo-xlib.h +++ b/src/cairo-xlib.h @@ -92,4 +92,3 @@ CAIRO_END_DECLS #endif /* CAIRO_HAS_XLIB_SURFACE */ #endif /* CAIRO_XLIB_H */ - diff --git a/src/cairo.c b/src/cairo.c index 8a8e75ad..640cf7d0 100644 --- a/src/cairo.c +++ b/src/cairo.c @@ -440,7 +440,6 @@ bail: } slim_hidden_def(cairo_push_group_with_content); - /** * cairo_pop_group: * @cr: a cairo context @@ -941,7 +940,6 @@ cairo_set_miter_limit (cairo_t *cr, double limit) _cairo_set_error (cr, cr->status); } - /** * cairo_translate: * @cr: a cairo context @@ -987,7 +985,6 @@ cairo_scale (cairo_t *cr, double sx, double sy) _cairo_set_error (cr, cr->status); } - /** * cairo_rotate: * @cr: a cairo context diff --git a/src/cairo.h b/src/cairo.h index ecda958b..5b2b4edc 100644 --- a/src/cairo.h +++ b/src/cairo.h @@ -386,7 +386,6 @@ cairo_set_fill_rule (cairo_t *cr, cairo_fill_rule_t fill_rule); cairo_public void cairo_set_line_width (cairo_t *cr, double width); - /** * cairo_line_cap_t * @CAIRO_LINE_CAP_BUTT: start(stop) the line exactly at the start(end) point @@ -852,7 +851,6 @@ cairo_font_options_set_hint_metrics (cairo_font_options_t *options, cairo_public cairo_hint_metrics_t cairo_font_options_get_hint_metrics (const cairo_font_options_t *options); - /* This interface is for dealing with text as text, not caring about the font object inside the the cairo_t. */ @@ -1620,7 +1618,6 @@ cairo_debug_reset_static_data (void); #define cairo_xcb_surface_create_for_pixmap_with_visual cairo_xcb_surface_create_for_pixmap_with_visual_REPLACED_BY_cairo_xcb_surface_create #define cairo_xcb_surface_create_for_window_with_visual cairo_xcb_surface_create_for_window_with_visual_REPLACED_BY_cairo_xcb_surface_create - #define cairo_current_path cairo_current_path_DEPRECATED_BY_cairo_copy_path #define cairo_current_path_flat cairo_current_path_flat_DEPRECATED_BY_cairo_copy_path_flat #define cairo_get_path cairo_get_path_DEPRECATED_BY_cairo_copy_path diff --git a/src/cairoint.h b/src/cairoint.h index 0e205b4d..3a9c9936 100644 --- a/src/cairoint.h +++ b/src/cairoint.h @@ -159,7 +159,6 @@ cairo_private void _cairo_beos_unlock(void*); # define CAIRO_MUTEX_UNLOCK(name) _cairo_beos_unlock (&name) #endif - #ifndef CAIRO_MUTEX_DECLARE # error "No mutex declarations. Cairo will not work with multiple threads." \ "(Remove this #error directive to acknowledge & accept this limitation)." @@ -338,7 +337,6 @@ _cairo_box_round_to_rectangle (cairo_box_t *box, cairo_rectangle_fixed_t *rectan cairo_private void _cairo_rectangle_intersect (cairo_rectangle_fixed_t *dest, cairo_rectangle_fixed_t *src); - /* cairo_array.c structures and functions */ typedef struct _cairo_array cairo_array_t; @@ -894,7 +892,6 @@ struct _cairo_image_surface { cairo_bool_t owns_data; cairo_bool_t has_clip; - int width; int height; int stride; @@ -2200,7 +2197,6 @@ typedef cairo_status_t (*cairo_write_func_t) (void *closure, */ typedef cairo_status_t (*cairo_close_func_t) (void *closure); - /* This function never returns NULL. If an error occurs (NO_MEMORY) * while trying to create the output stream this function returns a * valid pointer to a nil output stream. -- cgit v1.2.3