fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2025-12-29 15:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove initial, final, and duplicate blank lines.

Browse source 
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.
This commit is contained in:
Carl Worth 2006-06-06 15:50:33 -07:00
parent 5278de0997
commit ef10a0403a
73 changed files with 0 additions and 184 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/tutorial/src/include/cairo-tutorial.h
View file

@ -38,4 +38,3 @@
#elif CAIRO_TUTORIAL_PNG
#include "cairo-tutorial-png.h"
#endif

15
pixman/src/fbcompose.c
View file

@ -568,7 +568,6 @@ fbFetch_c4 (const FbBits *bits, int x, int width, CARD32 *buffer, miIndexedPtr i
}
}
static FASTCALL void
fbFetch_a1 (const FbBits *bits, int x, int width, CARD32 *buffer, miIndexedPtr indexed)
{
@ -1002,7 +1001,6 @@ fbFetchPixel_c4 (const FbBits *bits, int offset, miIndexedPtr indexed)
return indexed->rgba[pixel];
}
static FASTCALL CARD32
fbFetchPixel_a1 (const FbBits *bits, int offset, miIndexedPtr indexed)
{
@ -1085,8 +1083,6 @@ static fetchPixelProc fetchPixelProcForPicture (PicturePtr pict)
}
}
/*
* All the store functions
*/
@ -1470,7 +1466,6 @@ fbStore_g1 (FbBits *bits, const CARD32 *values, int x, int width, miIndexedPtr i
}
}
static storeProc storeProcForPicture (PicturePtr pict)
{
switch(pict->format_code) {
@ -1521,7 +1516,6 @@ static storeProc storeProcForPicture (PicturePtr pict)
}
}
/*
* Combine src and mask
*/
@ -1553,7 +1547,6 @@ fbCombineSrcU (CARD32 *dest, const CARD32 *src, int width)
memcpy(dest, src, width*sizeof(CARD32));
}
static FASTCALL void
fbCombineOverU (CARD32 *dest, const CARD32 *src, int width)
{
@ -1967,21 +1960,18 @@ fbCombineConjointOverU (CARD32 *dest, const CARD32 *src, int width)
fbCombineConjointGeneralU (dest, src, width, CombineAOver);
}
static FASTCALL void
fbCombineConjointOverReverseU (CARD32 *dest, const CARD32 *src, int width)
{
fbCombineConjointGeneralU (dest, src, width, CombineBOver);
}
static FASTCALL void
fbCombineConjointInU (CARD32 *dest, const CARD32 *src, int width)
{
fbCombineConjointGeneralU (dest, src, width, CombineAIn);
}
static FASTCALL void
fbCombineConjointInReverseU (CARD32 *dest, const CARD32 *src, int width)
{
@ -2122,7 +2112,6 @@ fbCombineMaskValueC (CARD32 *src, const CARD32 *mask, int width)
}
}
static FASTCALL void
fbCombineMaskAlphaC (const CARD32 *src, CARD32 *mask, int width)
{
@ -2686,14 +2675,12 @@ static CombineFuncC fbCombineFuncC[] = {
fbCombineConjointXorC,
};
FbComposeFunctions composeFunctions = {
fbCombineFuncU,
fbCombineFuncC,
fbCombineMaskU
};
static void fbFetchSolid(PicturePtr pict, int x, int y, int width, CARD32 *buffer, CARD32 *mask, CARD32 maskBits)
{
FbBits *bits;
@ -3537,7 +3524,6 @@ static void fbFetchTransformed(PicturePtr pict, int x, int y, int width, CARD32
}
}
static void fbFetchExternalAlpha(PicturePtr pict, int x, int y, int width, CARD32 *buffer, CARD32 *mask, CARD32 maskBits)
{
int i;
@ -3634,7 +3620,6 @@ static void fbStoreExternalAlpha(PicturePtr pict, int x, int y, int width, CARD3
bits += y*stride;
alpha_bits += (ay - pict->alphaOrigin.y)*astride;
store(bits, buffer, x, width, indexed);
astore(alpha_bits, buffer, ax - pict->alphaOrigin.x, width, aindexed);
}

1
pixman/src/fbedge.c
View file

@ -61,7 +61,6 @@
#undef rasterizeEdges
#undef N_BITS
/*
* 1 bit alpha
*/

7
pixman/src/fbmmx.c
View file

@ -29,7 +29,6 @@
* Based on work by Owen Taylor
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@ -393,7 +392,6 @@ mmxCombineMaskU (CARD32 *src, const CARD32 *mask, int width)
_mm_empty();
}
static FASTCALL void
mmxCombineOverU (CARD32 *dest, const CARD32 *src, int width)
{
@ -610,7 +608,6 @@ mmxCombineSaturateU (CARD32 *dest, const CARD32 *src, int width)
_mm_empty();
}
static FASTCALL void
mmxCombineSrcC (CARD32 *dest, CARD32 *src, CARD32 *mask, int width)
{
@ -665,7 +662,6 @@ mmxCombineOverReverseC (CARD32 *dest, CARD32 *src, CARD32 *mask, int width)
_mm_empty();
}
static FASTCALL void
mmxCombineInC (CARD32 *dest, CARD32 *src, CARD32 *mask, int width)
{
@ -863,7 +859,6 @@ void fbComposeSetupMMX(void)
}
}
/* ------------------ MMX code paths called from fbpict.c ----------------------- */
void
@ -1401,7 +1396,6 @@ fbCompositeSrc_8888x8888mmx (pixman_operator_t op,
_mm_empty();
}
void
fbCompositeSolidMask_nx8x8888mmx (pixman_operator_t op,
PicturePtr pSrc,
@ -1647,7 +1641,6 @@ fbCompositeSolidMaskSrc_nx8x8888mmx (pixman_operator_t op,
_mm_empty();
}
void
fbCompositeSolidMask_nx8x0565mmx (pixman_operator_t op,
PicturePtr pSrc,

4
pixman/src/fbpict.c
View file

@ -736,8 +736,6 @@ fbCompositeSrc_8888x0565 (pixman_operator_t op,
}
}
static void
fbCompositeSrcAdd_8000x8000 (pixman_operator_t op,
PicturePtr pSrc,
@ -1069,8 +1067,6 @@ fbCompositeTrans_0565xnx0565(pixman_operator_t op,
}
}
/* macros for "i can't believe it's not fast" packed pixel handling */
#define alphamaskCombine24(a,b) genericCombine24(a,b,maskAlpha,maskiAlpha)
static void

1
pixman/src/fbpict.h
View file

@ -59,7 +59,6 @@
#define FbAdd(x,y,i,t) ((t) = FbGet8(x,i) + FbGet8(y,i), \
(CARD32) ((CARD8) ((t) | (0 - ((t) >> 8)))) << (i))
#define Alpha(x) ((x) >> 24)
#define Red(x) (((x) >> 16) & 0xff)
#define Green(x) (((x) >> 8) & 0xff)

1
pixman/src/icbltone.c
View file

@ -739,4 +739,3 @@ fbBltOne24 (FbStip *srcLine,
}
}
#endif

1
pixman/src/icimage.c
View file

@ -355,7 +355,6 @@ pixman_image_init (pixman_image_t *image)
image->filter_params = NULL;
image->filter_nparams = 0;
image->owns_pixels = 0;
image->pSourcePict = NULL;

1
pixman/src/icimage.h
View file

@ -219,7 +219,6 @@ FbValidatePicture (PicturePtr pPicture,
Mask mask);
*/
/* XXX: What should this be?
pixman_private int
FbClipPicture (pixman_region16_t *region,

11
pixman/src/icint.h
View file

@ -66,7 +66,6 @@ typedef struct _FbPoint {
typedef unsigned int Mask;
#define GXcopy 0x3
#define GXor 0x7
#define ClipByChildren 0
@ -75,7 +74,6 @@ typedef unsigned int Mask;
#define CPClipMask (1 << 6)
#define CPLastBit 11
/* Define any names that the server code will be expecting in
* terms of libpixman names. */
@ -116,7 +114,6 @@ typedef pixman_triangle_t xTriangle;
# define BITMAP_BIT_ORDER LSBFirst
#endif
#define MAXSHORT SHRT_MAX
#define MINSHORT SHRT_MIN
@ -124,8 +121,6 @@ typedef pixman_triangle_t xTriangle;
#include "picture.h"
*/
#include "pixman.h"
/* XXX: Most of this file is straight from fb.h and I imagine we can
@ -166,11 +161,9 @@ typedef pixman_triangle_t xTriangle;
#define FbFullMask(n) ((n) == FB_UNIT ? FB_ALLONES : ((((FbBits) 1) << n) - 1))
typedef uint32_t FbStip;
typedef int FbStride;
#ifdef FB_DEBUG
extern void fbValidateDrawable(DrawablePtr d);
extern void fbInitializeDrawable(DrawablePtr d);
@ -223,7 +216,6 @@ extern void fbSetBits (FbStip *bits, int stride, FbStip data);
#define FbStipMask(x,w) (FbStipRight(FB_STIP_ALLONES,(x) & FB_STIP_MASK) & \
FbStipLeft(FB_STIP_ALLONES,(FB_STIP_UNIT - ((x)+(w))) & FB_STIP_MASK))
#define FbMaskBits(x,w,l,n,r) { \
n = (w); \
r = FbRightMask((x)+n); \
@ -441,7 +433,6 @@ extern void fbSetBits (FbStip *bits, int stride, FbStip data);
} \
}
#define FbDoRightMaskByteRRop(dst,rb,r,and,xor) { \
switch (rb) { \
case 1: \
@ -870,7 +861,6 @@ slim_hidden_proto(pixman_image_set_component_alpha)
slim_hidden_proto(pixman_image_set_repeat)
slim_hidden_proto(pixman_composite)
#include "icrop.h"
/* XXX: For now, I'm just wholesale pasting Xserver/render/picture.h here: */
@ -1078,7 +1068,6 @@ typedef xFixed_16_16 xFixed;
#endif /* _PICTURE_H_ */
/* Macros needed by fbpict.c */
#define cvt8888to0565(s) ((((s) >> 3) & 0x001f) | \

1
pixman/src/icpixels.c
View file

@ -112,4 +112,3 @@ FbPixelsDestroy (FbPixels *pixels)
free(pixels);
}

2
pixman/src/icrect.c
View file

@ -29,7 +29,6 @@ typedef void (*FillFunc) (pixman_image_t *dst,
uint16_t height,
pixman_bits_t *pixel);
static void
pixman_fill_rect_1bpp (pixman_image_t *dst,
int16_t xDst,
@ -177,7 +176,6 @@ pixman_fill_rect_general (pixman_image_t *dst,
}
}
static void
pixman_color_rects (pixman_image_t *dst,
pixman_image_t *clipPict,

1
pixman/src/ictransform.c
View file

@ -61,4 +61,3 @@ pixman_transform_point (pixman_transform_t *transform,
vector->vector[2] = xFixed1;
return 1;
}

1
pixman/src/ictri.c
View file

@ -361,4 +361,3 @@ pixman_composite_tri_fan (pixman_operator_t op,
pixman_format_destroy (format);
}

1
pixman/src/icutil.c
View file

@ -70,7 +70,6 @@ const FbMergeRopRec FbMergeRopBits[16] = {
#define Mask(x,w) BitsMask((x)*(w),(w))
#define SelMask(b,n,w) ((((b) >> n) & 1) * Mask(n,w))
#define C1(b,w) \

1
pixman/src/pixman-xserver-compat.h
View file

@ -122,5 +122,4 @@ fbRasterizeEdges (pixman_bits_t *buf,
pixman_fixed16_16_t t,
pixman_fixed16_16_t b);
#endif

10
pixman/src/pixman.h
View file

@ -1,13 +1,10 @@
#ifndef _PIXMAN_H_
#define _PIXMAN_H_
/* pixman.h - a merge of pixregion.h and ic.h */
/* from pixregion.h */
/***********************************************************
Copyright 1987, 1998 The Open Group
@ -32,7 +29,6 @@ Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
All Rights Reserved
@ -78,7 +74,6 @@ SOFTWARE.
* PERFORMANCE OF THIS SOFTWARE.
*/
#if defined (__SVR4) && defined (__sun)
# include <sys/int_types.h>
#elif defined (__OpenBSD__) || defined (_AIX) || defined (__osf__)
@ -201,10 +196,8 @@ pixman_region_reset (pixman_region16_t *region, pixman_box16_t *pBox);
void
pixman_region_empty (pixman_region16_t *region);
/* ic.h */
/* icformat.c */
typedef enum pixman_operator {
PIXMAN_OPERATOR_CLEAR,
@ -486,7 +479,6 @@ pixman_composite_tri_strip (pixman_operator_t op,
const pixman_point_fixed_t *points,
int npoints);
void
pixman_composite_tri_fan (pixman_operator_t op,
pixman_image_t *src,
@ -512,8 +504,6 @@ pixman_composite (pixman_operator_t op,
int width,
int height);
#if defined(__cplusplus) || defined(c_plusplus)
}
#endif

12
pixman/src/pixregion.c
View file

@ -22,7 +22,6 @@ Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
Copyright 1987, 1988, 1989 by
Digital Equipment Corporation, Maynard, Massachusetts.
@ -194,7 +193,6 @@ if (!(pReg)->data || (((pReg)->data->numRects + (n)) > (pReg)->data->size)) \
assert(pReg->data->numRects<=pReg->data->size); \
}
#define DOWNSIZE(reg,numRects) \
if (((numRects) < ((reg)->data->size >> 1)) && ((reg)->data->size > 50)) \
{ \
@ -207,7 +205,6 @@ if (((numRects) < ((reg)->data->size >> 1)) && ((reg)->data->size > 50)) \
} \
}
#ifdef DEBUG_PIXREGION
int
pixman_region16_print(rgn)
@ -230,7 +227,6 @@ pixman_region16_print(rgn)
return(num);
}
pixman_region_status_t
pixman_region16_tsEqual(reg1, reg2)
pixman_region16_t * reg1;
@ -304,7 +300,6 @@ pixman_region16_valid(reg)
#endif /* DEBUG_PIXREGION */
/* Create a new empty region */
pixman_region16_t *
pixman_region_create (void)
@ -457,7 +452,6 @@ pixman_region_copy(pixman_region16_t *dst, pixman_region16_t *src)
}
slim_hidden_def(pixman_region_copy);
/*======================================================================
* Generic Region Operator
*====================================================================*/
@ -537,7 +531,6 @@ pixman_coalesce (
return prevStart;
}
/* Quicky macro to avoid trivial reject procedure calls to pixman_coalesce */
#define Coalesce(newReg, prevBand, curBand) \
@ -992,7 +985,6 @@ pixman_region_intersectO (
return PIXMAN_REGION_STATUS_SUCCESS;
}
pixman_region_status_t
pixman_region_intersect(newReg, reg1, reg2)
pixman_region16_t * newReg; /* destination Region */
@ -1241,7 +1233,6 @@ pixman_region_union(pixman_region16_t *newReg, pixman_region16_t *reg1, pixman_r
}
slim_hidden_def(pixman_region_union);
/*======================================================================
* Batch Rectangle Union
*====================================================================*/
@ -1349,7 +1340,6 @@ pixman_region_append(dstrgn, rgn)
return PIXMAN_REGION_STATUS_SUCCESS;
}
#define ExchangeRects(a, b) \
{ \
pixman_box16_t t; \
@ -1727,7 +1717,6 @@ pixman_region_rectsToRegion(nrects, prect, ctype)
* Region Subtraction
*====================================================================*/
/*-
*-----------------------------------------------------------------------
* pixman_region_subtractO --
@ -1838,7 +1827,6 @@ pixman_region_subtractO (
}
} while ((r1 != r1End) && (r2 != r2End));
/*
* Add remaining minuend rectangles to region.
*/

1
pixman/src/pixregionint.h
View file

@ -22,7 +22,6 @@ Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
All Rights Reserved

1
pixman/src/renderedge.c
View file

@ -192,4 +192,3 @@ RenderLineFixedEdgeInit (RenderEdge *e,
bot->x + x_off_fixed,
bot->y + y_off_fixed);
}

2
src/cairo-analysis-surface.c
View file

@ -255,5 +255,3 @@ _cairo_analysis_surface_has_unsupported (cairo_surface_t *abstract_surface)
return surface->fallback;
}

1
src/cairo-array.c
View file

@ -460,4 +460,3 @@ _cairo_user_data_array_set_data (cairo_user_data_array_t *array,
return CAIRO_STATUS_SUCCESS;
}

6
src/cairo-atsui-font.c
View file

@ -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,
};

1
src/cairo-base85-stream.c
View file

@ -127,4 +127,3 @@ _cairo_base85_stream_create (cairo_output_stream_t *output)
_cairo_base85_stream_close,
stream);
}

1
src/cairo-beos.h
View file

@ -58,4 +58,3 @@ CAIRO_END_DECLS
#endif /* CAIRO_HAS_BEOS_SURFACE */
#endif /* CAIRO_BEOS_H */

2
src/cairo-cache.c
View file

@ -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;
}

2
src/cairo-clip.c
View file

@ -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,
}
}
}

1
src/cairo-debug.c
View file

@ -69,4 +69,3 @@ cairo_debug_reset_static_data (void)
_cairo_ft_font_reset_static_data ();
#endif
}

11
src/cairo-directfb-surface.c
View file

@ -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);
}

9
src/cairo-directfb.h
View file

@ -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*/

1
src/cairo-font-subset-private.h
View file

@ -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);

2
src/cairo-font-subset.c
View file

@ -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;

1
src/cairo-ft-font.c
View file

@ -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;

1
src/cairo-glitz-surface.c
View file

@ -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,

3
src/cairo-matrix.c
View file

@ -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

2
src/cairo-output-stream.c
View file

@ -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. */

1
src/cairo-path-fill.c
View file

@ -205,4 +205,3 @@ BAIL:
return status;
}

1
src/cairo-path.c
View file

@ -613,4 +613,3 @@ _cairo_path_fixed_offset (cairo_path_fixed_t *path,
CAIRO_FIXED_ONE,
CAIRO_FIXED_ONE);
}

2
src/cairo-pdf-surface.c
View file

@ -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

1
src/cairo-pdf-test.h
View file

@ -52,4 +52,3 @@ CAIRO_END_DECLS
#endif /* CAIRO_HAS_PDF_SURFACE */
#endif /* CAIRO_PDF_TEST_H */

1
src/cairo-png.c
View file

@ -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);
}

1
src/cairo-ps-surface.c
View file

@ -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:

1
src/cairo-quartz-surface.c
View file

@ -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,

1
src/cairo-quartz.h
View file

@ -58,4 +58,3 @@ CAIRO_END_DECLS
#endif /* CAIRO_HAS_QUARTZ_SURFACE */
#endif /* CAIRO_QUARTZ_H */

1
src/cairo-region.c
View file

@ -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;
}

1
src/cairo-scaled-font-subsets.c
View file

@ -39,7 +39,6 @@
* Keith Packard <keithp@keithp.com>
*/
#include "cairoint.h"
#include "cairo-scaled-font-subsets-private.h"

1
src/cairo-scaled-font.c
View file

@ -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)
{

4
src/cairo-slope.c
View file

@ -97,7 +97,3 @@ _cairo_slope_counter_clockwise (cairo_slope_t *a, cairo_slope_t *b)
{
return ! _cairo_slope_clockwise (a, b);
}

1
src/cairo-spline.c
View file

@ -283,4 +283,3 @@ _cairo_spline_decompose (cairo_spline_t *spline, double tolerance)
return CAIRO_STATUS_SUCCESS;
}

1
src/cairo-stroke-style.c
View file

@ -84,4 +84,3 @@ _cairo_stroke_style_fini (cairo_stroke_style_t *style)
}
style->num_dashes = 0;
}

1
src/cairo-svg-surface.c
View file

@ -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,

1
src/cairo-traps.c
View file

@ -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));

3
src/cairo-unicode.c
View file

@ -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;

3
src/cairo-win32-font.c
View file

@ -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)
{

2
src/cairo-win32-surface.c
View file

@ -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

1
src/cairo-xcb-surface.c
View file

@ -1326,4 +1326,3 @@ cairo_xcb_surface_set_size (cairo_surface_t *surface,
xcb_surface->width = width;
xcb_surface->height = height;
}

3
src/cairo-xlib-surface.c
View file

@ -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;
}

1
src/cairo-xlib-test.h
View file

@ -52,4 +52,3 @@ CAIRO_END_DECLS
#endif /* CAIRO_HAS_XLIB_SURFACE */
#endif /* CAIRO_XLIB_H */

1
src/cairo-xlib-xrender.h
View file

@ -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 */

1
src/cairo-xlib.h
View file

@ -92,4 +92,3 @@ CAIRO_END_DECLS
#endif /* CAIRO_HAS_XLIB_SURFACE */
#endif /* CAIRO_XLIB_H */

3
src/cairo.c
View file

@ -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

3
src/cairo.h
View file

@ -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

4
src/cairoint.h
View file

@ -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.

1
test/buffer-diff.c
View file

@ -52,7 +52,6 @@ xunlink (const char *pathname)
}
}
/* This function should be rewritten to compare all formats supported by
* cairo_format_t instead of taking a mask as a parameter.
*/

2
test/buffer-diff.h
View file

@ -54,7 +54,6 @@ buffer_diff_noalpha (unsigned char *buf_a,
int stride_b,
int stride_diff);
/* Returns number of pixels changed, (or -1 on error).
* Also saves a "diff" image intended to visually show where the
* images differ.
@ -78,5 +77,4 @@ image_diff_flattened (const char *filename_a,
int bx,
int by);
#endif

4
test/cairo-test-directfb.c
View file

@ -1,4 +1,3 @@
/*
Test were run with the following script
target can be directfb_bitmap or directfb
@ -8,7 +7,6 @@ export DFBARGS=quiet,no-banner,no-debug,log-file=dfblog,system=x11
cd cairo/test
make check
*/
#include <stdio.h>
@ -43,7 +41,6 @@ static DFBInfo *init(void) {
if( !info )
return NULL;
DFBCHECK(DirectFBInit( NULL,NULL));
DFBCHECK(DirectFBCreate( &info->dfb ));
info->dfb->GetDeviceDescription(info->dfb, &desc );
@ -61,7 +58,6 @@ static DFBInfo *init(void) {
return info;
}
cairo_surface_t *
create_directfb_surface (cairo_test_t* test, cairo_format_t format,
void **closure) {

2
test/cairo-test.c
View file

@ -451,7 +451,6 @@ create_glitz_glx_surface (glitz_format_name_t formatname,
goto DESTROY_WINDOW;
}
format = glitz_find_standard_format (drawable, formatname);
if (!format)
goto DESTROY_DRAWABLE;
@ -1529,7 +1528,6 @@ cairo_test_for_target (cairo_test_t *test,
goto UNWIND_SURFACE;
}
cairo_surface_set_device_offset (surface, dev_offset, dev_offset);
cr = cairo_create (surface);

4
test/font-face-get-type.c
View file

@ -58,7 +58,3 @@ main (void)
return CAIRO_TEST_SUCCESS;
}

2
test/push-group.c
View file

@ -23,10 +23,8 @@
* Author: Vladimir Vukicevic <vladimir@pobox.com>
*/
#include "cairo-test.h"
#define UNIT_SIZE 100
#define PAD 5
#define INNER_PAD 10

1
test/read-png.c
View file

@ -145,7 +145,6 @@ read_png_argb32 (const char *filename,
*height = png_height;
*stride = 4 * png_width;
/* convert palette/gray image to rgb */
if (color_type == PNG_COLOR_TYPE_PALETTE)
png_set_palette_to_rgb (png);

1
test/surface-finish-twice.c
View file

@ -73,4 +73,3 @@ main (void)
{
return cairo_test (&test, draw);
}

1
test/text-cache-crash.c
View file

@ -120,4 +120,3 @@ main (void)
return ret;
}

1
test/xmalloc.c
View file

@ -56,4 +56,3 @@ xcalloc (size_t nmemb, size_t size)
return buf;
}