fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-04-21 14:40:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correct some more renames where the order of the renaming caused later renames to fail due to earlier prefixes failing.

Browse source
This commit is contained in:
Dave Beckett 2003-12-10 15:39:45 +00:00
parent 4409b9fff9
commit af1ab1a9f2
7 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pixman/src/ic.c
View file

@ -898,7 +898,7 @@ pixman_composite (pixman_operator_t op,
}
region = pixman_region_create();
pixman_region_unionRect (region, region, xDst, yDst, width, height);
pixman_region_union_rect (region, region, xDst, yDst, width, height);
if (!IcComputeCompositeRegion (region,
iSrc,

12
pixman/src/icformat.c
View file

@ -30,22 +30,22 @@ pixman_format_create (pixman_format_tName name)
{
switch (name) {
case PIXMAN_FORMAT_NAME_AR_GB32:
return pixman_format_createMasks (32,
return pixman_format_create_masks (32,
0xff000000,
0x00ff0000,
0x0000ff00,
0x000000ff);
case PIXMAN_FORMAT_NAME_RG_B24:
return pixman_format_createMasks (32,
return pixman_format_create_masks (32,
0x0,
0xff0000,
0x00ff00,
0x0000ff);
case PIXMAN_FORMAT_NAME_A8:
return pixman_format_createMasks (8, 0xff,
return pixman_format_create_masks (8, 0xff,
0, 0, 0);
case PIXMAN_FORMAT_NAME_A1:
return pixman_format_createMasks (1, 0x1,
return pixman_format_create_masks (1, 0x1,
0, 0, 0);
}
@ -53,12 +53,12 @@ pixman_format_create (pixman_format_tName name)
}
/* XXX: There's some nonsense going on here. The macros above help
pixman_format_createMasks to encode a format into an int, while
pixman_format_create_masks to encode a format into an int, while
immediately afterwards pixman_format_init goes through the effort of
decoding it. This should all be disentagled, (it's probably
possible to just eliminate the encoding macros altogether). */
pixman_format_t *
pixman_format_createMasks (int bpp,
pixman_format_create_masks (int bpp,
int alpha_mask,
int red_mask,
int green_mask,

4
pixman/src/icimage.c
View file

@ -48,7 +48,7 @@ pixman_image_create (pixman_format_t *format,
slim_hidden_def(pixman_image_create);
pixman_image_t *
pixman_image_createForData (pixman_bits_t *data, pixman_format_t *format, int width, int height, int bpp, int stride)
pixman_image_create_for_data (pixman_bits_t *data, pixman_format_t *format, int width, int height, int bpp, int stride)
{
pixman_image_t *image;
IcPixels *pixels;
@ -131,7 +131,7 @@ pixman_image_init (pixman_image_t *image)
*/
image->pCompositeClip = pixman_region_create();
pixman_region_unionRect (image->pCompositeClip, image->pCompositeClip,
pixman_region_union_rect (image->pCompositeClip, image->pCompositeClip,
0, 0, image->pixels->width, image->pixels->height);
image->transform = NULL;

2
pixman/src/ictrap.c
View file

@ -110,7 +110,7 @@ pixman_trapezoid_bounds (int ntrap, const pixman_trapezoid_t *traps, pixman_box1
}
void
pixman_compositeTrapezoids (pixman_operator_t op,
pixman_composite_trapezoids (pixman_operator_t op,
pixman_image_t *src,
pixman_image_t *dst,
int xSrc,

6
pixman/src/ictri.c
View file

@ -135,7 +135,7 @@ IcRasterizeTriangle (pixman_image_t *image,
}
void
pixman_compositeTriangles (pixman_operator_t op,
pixman_composite_triangles (pixman_operator_t op,
pixman_image_t *src,
pixman_image_t *dst,
int xSrc,
@ -206,7 +206,7 @@ pixman_compositeTriangles (pixman_operator_t op,
}
void
pixman_compositeTriStrip (pixman_operator_t op,
pixman_composite_tri_strip (pixman_operator_t op,
pixman_image_t *src,
pixman_image_t *dst,
int xSrc,
@ -282,7 +282,7 @@ pixman_compositeTriStrip (pixman_operator_t op,
}
void
pixman_compositeTriFan (pixman_operator_t op,
pixman_composite_tri_fan (pixman_operator_t op,
pixman_image_t *src,
pixman_image_t *dst,
int xSrc,

20
pixman/src/pixman.h
View file

@ -54,7 +54,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
/* $Id: pixman.h,v 1.8 2003-12-10 23:24:18 dajobe Exp $ */
/* $Id: pixman.h,v 1.9 2003-12-10 23:40:15 dajobe Exp $ */
/* libic.h */
@ -121,7 +121,7 @@ extern pixman_region16_t * __external_linkage
pixman_region_create (void);
extern pixman_region16_t * __external_linkage
pixman_region_createSimple (pixman_box16_t *extents);
pixman_region_create_simple (pixman_box16_t *extents);
extern void __external_linkage
pixman_region_destroy (pixman_region16_t *region);
@ -141,7 +141,7 @@ extern pixman_region_status_t __external_linkage
pixman_region_union (pixman_region16_t *newReg, pixman_region16_t *reg1, pixman_region16_t *reg2);
extern pixman_region_status_t __external_linkage
pixman_region_unionRect(pixman_region16_t *dest, pixman_region16_t *source,
pixman_region_union_rect(pixman_region16_t *dest, pixman_region16_t *source,
int x, int y, unsigned int width, unsigned int height);
extern pixman_region_status_t __external_linkage
@ -237,7 +237,7 @@ extern pixman_format_t * __external_linkage
pixman_format_create (pixman_format_tName name);
extern pixman_format_t * __external_linkage
pixman_format_createMasks (int bpp,
pixman_format_create_masks (int bpp,
int alpha_mask,
int red_mask,
int green_mask,
@ -275,7 +275,7 @@ typedef uint32_t pixman_bits_t;
#endif
extern pixman_image_t * __external_linkage
pixman_image_createForData (pixman_bits_t *data, pixman_format_t *format, int width, int height, int bpp, int stride);
pixman_image_create_for_data (pixman_bits_t *data, pixman_format_t *format, int width, int height, int bpp, int stride);
extern void __external_linkage
pixman_image_destroy (pixman_image_t *image);
@ -352,7 +352,7 @@ extern int __external_linkage
pixman_image_get_depth (pixman_image_t *image);
extern pixman_format_t * __external_linkage
pixman_image_tGetFormat (pixman_image_t *image);
pixman_image_get_format (pixman_image_t *image);
extern pixman_bits_t * __external_linkage
pixman_image_get_data (pixman_image_t *image);
@ -399,7 +399,7 @@ pixman_fill_rectangles (pixman_operator_t op,
/* XXX: Switch to enum for op */
extern void __external_linkage
pixman_compositeTrapezoids (pixman_operator_t op,
pixman_composite_trapezoids (pixman_operator_t op,
pixman_image_t *src,
pixman_image_t *dst,
int xSrc,
@ -410,7 +410,7 @@ pixman_compositeTrapezoids (pixman_operator_t op,
/* ictri.c */
extern void __external_linkage
pixman_compositeTriangles (pixman_operator_t op,
pixman_composite_triangles (pixman_operator_t op,
pixman_image_t *src,
pixman_image_t *dst,
int xSrc,
@ -419,7 +419,7 @@ pixman_compositeTriangles (pixman_operator_t op,
int ntris);
extern void __external_linkage
pixman_compositeTriStrip (pixman_operator_t op,
pixman_composite_tri_strip (pixman_operator_t op,
pixman_image_t *src,
pixman_image_t *dst,
int xSrc,
@ -429,7 +429,7 @@ pixman_compositeTriStrip (pixman_operator_t op,
extern void __external_linkage
pixman_compositeTriFan (pixman_operator_t op,
pixman_composite_tri_fan (pixman_operator_t op,
pixman_image_t *src,
pixman_image_t *dst,
int xSrc,

12
pixman/src/pixregion.c
View file

@ -88,7 +88,7 @@ pixman_init (pixman_region16_t *region, pixman_box16_t *rect);
static void
pixman_uninit (pixman_region16_t *region);
slim_hidden_proto(pixman_region_createSimple)
slim_hidden_proto(pixman_region_create_simple)
slim_hidden_proto(pixman_region_copy)
slim_hidden_proto(pixman_region_union)
@ -309,16 +309,16 @@ pixman_region16_tValidRegion(reg)
pixman_region16_t *
pixman_region_create (void)
{
return pixman_region_createSimple (NULL);
return pixman_region_create_simple (NULL);
}
/*****************************************************************
* pixman_region_createSimple (extents)
* pixman_region_create_simple (extents)
* This routine creates a pixman_region16_t for a simple
* rectangular region.
*****************************************************************/
pixman_region16_t *
pixman_region_createSimple (pixman_box16_t *extents)
pixman_region_create_simple (pixman_box16_t *extents)
{
pixman_region16_t *region;
@ -330,7 +330,7 @@ pixman_region_createSimple (pixman_box16_t *extents)
return region;
}
slim_hidden_def(pixman_region_createSimple);
slim_hidden_def(pixman_region_create_simple);
/*****************************************************************
* RegionInit(pReg, rect, size)
@ -1150,7 +1150,7 @@ pixman_region_unionO (
/* Convenience function for performing union of region with a single rectangle */
pixman_region_status_t
pixman_region_unionRect(pixman_region16_t *dest, pixman_region16_t *source,
pixman_region_union_rect(pixman_region16_t *dest, pixman_region16_t *source,
int x, int y, unsigned int width, unsigned int height)
{
pixman_region16_t region;