[cairo-commit]
cairo/pixman/src Makefile.am, 1.9, 1.10 icint.h, 1.37,
1.38 pixman-remap.h, NONE, 1.1 pixman.h, 1.21, 1.22
Carl Worth
commit at pdx.freedesktop.org
Wed Aug 10 12:36:53 PDT 2005
- Previous message: [cairo-commit] cairo ChangeLog, 1.865, 1.866 Makefile.am, 1.14,
1.15 cairo.pc.in, 1.20, 1.21 configure.in, 1.121, 1.122
- Next message: [cairo-commit] cairo/src Makefile.am,1.59,1.60
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: cworth
Update of /cvs/cairo/cairo/pixman/src
In directory gabe:/tmp/cvs-serv5810/pixman/src
Modified Files:
Makefile.am icint.h pixman.h
Added Files:
pixman-remap.h
Log Message:
2005-08-10 Carl Worth <cworth at cworth.org>
From Keith Packard <keithp at keithp.com>,
Build pixman internally as a private part of cairo, with suitable
name changes to avoid any visible pixman symbols in the cairo
library:
* Makefile.am: Descend into pixman.
* cairo.pc.in: Drop libpixman from Requires.
* configure.in: Don't check for libpixman. Check version of
pkg-config and use Requires.private instead of Requires in
cairo.pc if possible. Generate pixman Makefiles.
* pixman/Makefile.am: Rip out release-publish target and
installation of libpixman.pc.
* pixman/src/Makefile.am: Add pixman-remap.h. Drop libpixman.la
target.
* pixman/src/icint.h: Fix to include config.h rather than
../config.h
* pixman/src/pixman-remap.h: This is the cpp magic to rename all
pixman functions from the various fb, Fb, INT_pixman, pixman,
Render, _Render, or no prefix to _cairo_pixman_ prefixes.
* pixman/src/pixman.h: Include pixman-remap.h to get all the
cairo-internalized names.
* src/Makefile.am:
* test/Makefile.am: Add -Ipixman/src to get at
pixman-remap.h.
Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/pixman/src/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.am 21 Jan 2005 18:59:33 -0000 1.9
+++ Makefile.am 10 Aug 2005 19:36:51 -0000 1.10
@@ -1,8 +1,8 @@
-lib_LTLIBRARIES = libpixman.la
-include_HEADERS = pixman.h
+noinst_LTLIBRARIES = libpixman.la
libpixman_la_SOURCES = \
pixman.h \
+ pixman-remap.h \
pixman-xserver-compat.h \
pixregion.c \
pixregionint.h \
@@ -30,6 +30,4 @@
renderedge.h \
slim_internal.h
-libpixman_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
-
-INCLUDES = -I$(srcdir) $(WARN_CFLAGS)
+INCLUDES = -I$(top_srcdir) -I$(srcdir) $(WARN_CFLAGS)
Index: icint.h
===================================================================
RCS file: /cvs/cairo/cairo/pixman/src/icint.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- icint.h 5 Aug 2005 19:14:12 -0000 1.37
+++ icint.h 10 Aug 2005 19:36:51 -0000 1.38
@@ -24,7 +24,7 @@
#define _ICINT_H_
#ifdef HAVE_CONFIG_H
-# include "../config.h"
+# include "config.h"
#endif
#include "pixman.h"
--- NEW FILE: pixman-remap.h ---
#define fb16Lane _cairo_pixman_16_lane
#define fb32Lane _cairo_pixman_32_lane
#define fb8Lane _cairo_pixman_8_lane
#define fbAccessMap _cairo_pixman_access_map
#define fbBlt _cairo_pixman_blt
#define fbBlt24 _cairo_pixman_blt24
#define fbBlt24Line _cairo_pixman_blt24_line
#define fbBltOne _cairo_pixman_blt_one
#define fbBltOne24 _cairo_pixman_blt_one24
#define fbBltStip _cairo_pixman_blt_stip
#define fbBuildCompositeOperand _cairo_pixman_build_composite_operand
#define fbCombineAddC _cairo_pixman_combine_add_c
#define fbCombineAddU _cairo_pixman_combine_add_u
#define fbCombineAtopC _cairo_pixman_combine_atop_c
#define fbCombineAtopReverseC _cairo_pixman_combine_atop_reverse_c
#define fbCombineAtopReverseU _cairo_pixman_combine_atop_reverse_u
#define fbCombineAtopU _cairo_pixman_combine_atop_u
#define fbCombineClear _cairo_pixman_combine_clear
#define fbCombineConjointAtopC _cairo_pixman_combine_conjoint_atop_c
#define fbCombineConjointAtopReverseC _cairo_pixman_combine_conjoint_atop_reverse_c
#define fbCombineConjointAtopReverseU _cairo_pixman_combine_conjoint_atop_reverse_u
#define fbCombineConjointAtopU _cairo_pixman_combine_conjoint_atop_u
#define fbCombineConjointGeneralC _cairo_pixman_combine_conjoint_general_c
#define fbCombineConjointGeneralU _cairo_pixman_combine_conjoint_general_u
#define fbCombineConjointInC _cairo_pixman_combine_conjoint_in_c
#define fbCombineConjointInPart _cairo_pixman_combine_conjoint_in_part
#define fbCombineConjointInReverseC _cairo_pixman_combine_conjoint_in_reverse_c
#define fbCombineConjointInReverseU _cairo_pixman_combine_conjoint_in_reverse_u
#define fbCombineConjointInU _cairo_pixman_combine_conjoint_in_u
#define fbCombineConjointOutC _cairo_pixman_combine_conjoint_out_c
#define fbCombineConjointOutPart _cairo_pixman_combine_conjoint_out_part
#define fbCombineConjointOutReverseC _cairo_pixman_combine_conjoint_out_reverse_c
#define fbCombineConjointOutReverseU _cairo_pixman_combine_conjoint_out_reverse_u
#define fbCombineConjointOutU _cairo_pixman_combine_conjoint_out_u
#define fbCombineConjointOverC _cairo_pixman_combine_conjoint_over_c
#define fbCombineConjointOverReverseC _cairo_pixman_combine_conjoint_over_reverse_c
#define fbCombineConjointOverReverseU _cairo_pixman_combine_conjoint_over_reverse_u
#define fbCombineConjointOverU _cairo_pixman_combine_conjoint_over_u
#define fbCombineConjointXorC _cairo_pixman_combine_conjoint_xor_c
#define fbCombineConjointXorU _cairo_pixman_combine_conjoint_xor_u
#define fbCombineDisjointAtopC _cairo_pixman_combine_disjoint_atop_c
#define fbCombineDisjointAtopReverseC _cairo_pixman_combine_disjoint_atop_reverse_c
#define fbCombineDisjointAtopReverseU _cairo_pixman_combine_disjoint_atop_reverse_u
#define fbCombineDisjointAtopU _cairo_pixman_combine_disjoint_atop_u
#define fbCombineDisjointGeneralC _cairo_pixman_combine_disjoint_general_c
#define fbCombineDisjointGeneralU _cairo_pixman_combine_disjoint_general_u
#define fbCombineDisjointInC _cairo_pixman_combine_disjoint_in_c
#define fbCombineDisjointInPart _cairo_pixman_combine_disjoint_in_part
#define fbCombineDisjointInReverseC _cairo_pixman_combine_disjoint_in_reverse_c
#define fbCombineDisjointInReverseU _cairo_pixman_combine_disjoint_in_reverse_u
#define fbCombineDisjointInU _cairo_pixman_combine_disjoint_in_u
#define fbCombineDisjointOutC _cairo_pixman_combine_disjoint_out_c
#define fbCombineDisjointOutPart _cairo_pixman_combine_disjoint_out_part
#define fbCombineDisjointOutReverseC _cairo_pixman_combine_disjoint_out_reverse_c
#define fbCombineDisjointOutReverseU _cairo_pixman_combine_disjoint_out_reverse_u
#define fbCombineDisjointOutU _cairo_pixman_combine_disjoint_out_u
#define fbCombineDisjointOverC _cairo_pixman_combine_disjoint_over_c
#define fbCombineDisjointOverReverseC _cairo_pixman_combine_disjoint_over_reverse_c
#define fbCombineDisjointOverReverseU _cairo_pixman_combine_disjoint_over_reverse_u
#define fbCombineDisjointOverU _cairo_pixman_combine_disjoint_over_u
#define fbCombineDisjointXorC _cairo_pixman_combine_disjoint_xor_c
#define fbCombineDisjointXorU _cairo_pixman_combine_disjoint_xor_u
#define fbCombineDst _cairo_pixman_combine_dst
#define fbCombineFuncC _cairo_pixman_combine_func_c
#define fbCombineFuncU _cairo_pixman_combine_func_u
#define fbCombineInC _cairo_pixman_combine_in_c
#define fbCombineInReverseC _cairo_pixman_combine_in_reverse_c
#define fbCombineInReverseU _cairo_pixman_combine_in_reverse_u
#define fbCombineInU _cairo_pixman_combine_in_u
#define fbCombineMaskAlphaC _cairo_pixman_combine_mask_alpha_c
#define fbCombineMaskAlphaU _cairo_pixman_combine_mask_alpha_u
#define fbCombineMaskC _cairo_pixman_combine_mask_c
#define fbCombineMaskU _cairo_pixman_combine_mask_u
#define fbCombineMaskValueC _cairo_pixman_combine_mask_value_c
#define fbCombineOutC _cairo_pixman_combine_out_c
#define fbCombineOutReverseC _cairo_pixman_combine_out_reverse_c
#define fbCombineOutReverseU _cairo_pixman_combine_out_reverse_u
#define fbCombineOutU _cairo_pixman_combine_out_u
#define fbCombineOverC _cairo_pixman_combine_over_c
#define fbCombineOverReverseC _cairo_pixman_combine_over_reverse_c
#define fbCombineOverReverseU _cairo_pixman_combine_over_reverse_u
#define fbCombineOverU _cairo_pixman_combine_over_u
#define fbCombineSaturateC _cairo_pixman_combine_saturate_c
#define fbCombineSaturateU _cairo_pixman_combine_saturate_u
#define fbCombineSrcC _cairo_pixman_combine_src_c
#define fbCombineSrcU _cairo_pixman_combine_src_u
#define fbCombineXorC _cairo_pixman_combine_xor_c
#define fbCombineXorU _cairo_pixman_combine_xor_u
#define fbCompositeSolidMask_nx1xn _cairo_pixman_composite_solid_mask_nx1xn
#define fbCompositeSolidMask_nx8888x0565 _cairo_pixman_composite_solid_mask_nx8888x0565
#define fbCompositeSolidMask_nx8888x0565C _cairo_pixman_composite_solid_mask_nx8888x0565_c
#define fbCompositeSolidMask_nx8888x8888C _cairo_pixman_composite_solid_mask_nx8888x8888_c
#define fbCompositeSolidMask_nx8x0565 _cairo_pixman_composite_solid_mask_nx8x0565
#define fbCompositeSolidMask_nx8x0888 _cairo_pixman_composite_solid_mask_nx8x0888
#define fbCompositeSolidMask_nx8x8888 _cairo_pixman_composite_solid_mask_nx8x8888
#define fbCompositeSrc_0565x0565 _cairo_pixman_composite_src_0565x0565
#define fbCompositeSrc_8888x0565 _cairo_pixman_composite_src_8888x0565
#define fbCompositeSrc_8888x0888 _cairo_pixman_composite_src_8888x0888
#define fbCompositeSrc_8888x8888 _cairo_pixman_composite_src_8888x8888
#define fbCompositeSrcAdd_1000x1000 _cairo_pixman_composite_src_add_1000x1000
#define fbCompositeSrcAdd_8000x8000 _cairo_pixman_composite_src_add_8000x8000
#define fbCompositeSrcAdd_8888x8888 _cairo_pixman_composite_src_add_8888x8888
#define fbCompositeSrcSrc_nxn _cairo_pixman_composite_src_src_nxn
#define fbCompositeTrans_0565xnx0565 _cairo_pixman_composite_trans_0565xnx0565
#define fbCompositeTrans_0888xnx0888 _cairo_pixman_composite_trans_0888xnx0888
#define FbComputeCompositeRegion _cairo_pixman_compute_composite_region
#define FbCreateAlphaPicture _cairo_pixman_create_alpha_picture
#define fbFetch_a1 _cairo_pixman_fetch_a1
#define fbFetch_a1b1g1r1 _cairo_pixman_fetch_a1b1g1r1
#define fbFetch_a1b5g5r5 _cairo_pixman_fetch_a1b5g5r5
#define fbFetch_a1r1g1b1 _cairo_pixman_fetch_a1r1g1b1
#define fbFetch_a1r5g5b5 _cairo_pixman_fetch_a1r5g5b5
#define fbFetch_a2r2g2b2 _cairo_pixman_fetch_a2r2g2b2
#define fbFetch_a4 _cairo_pixman_fetch_a4
#define fbFetch_a4b4g4r4 _cairo_pixman_fetch_a4b4g4r4
#define fbFetch_a4r4g4b4 _cairo_pixman_fetch_a4r4g4b4
#define fbFetch_a8 _cairo_pixman_fetch_a8
#define fbFetch_a8b8g8r8 _cairo_pixman_fetch_a8b8g8r8
#define fbFetch_a8r8g8b8 _cairo_pixman_fetch_a8r8g8b8
#define fbFetcha_a1 _cairo_pixman_fetcha_a1
#define fbFetcha_a4 _cairo_pixman_fetcha_a4
#define fbFetcha_a8 _cairo_pixman_fetcha_a8
#define fbFetcha_external _cairo_pixman_fetcha_external
#define fbFetcha_transform _cairo_pixman_fetcha_transform
#define fbFetch_b1g2r1 _cairo_pixman_fetch_b1g2r1
#define fbFetch_b2g3r3 _cairo_pixman_fetch_b2g3r3
#define fbFetch_b5g6r5 _cairo_pixman_fetch_b5g6r5
#define fbFetch_b8g8r8 _cairo_pixman_fetch_b8g8r8
#define fbFetch_external _cairo_pixman_fetch_external
#define fbFetch_r1g2b1 _cairo_pixman_fetch_r1g2b1
#define fbFetch_r3g3b2 _cairo_pixman_fetch_r3g3b2
#define fbFetch_r5g6b5 _cairo_pixman_fetch_r5g6b5
#define fbFetch_r8g8b8 _cairo_pixman_fetch_r8g8b8
#define fbFetch_transform _cairo_pixman_fetch_transform
#define fbFetch_x1b5g5r5 _cairo_pixman_fetch_x1b5g5r5
#define fbFetch_x1r5g5b5 _cairo_pixman_fetch_x1r5g5b5
#define fbFetch_x4b4g4r4 _cairo_pixman_fetch_x4b4g4r4
#define fbFetch_x4r4g4b4 _cairo_pixman_fetch_x4r4g4b4
#define fbFetch_x8b8g8r8 _cairo_pixman_fetch_x8b8g8r8
#define fbFetch_x8r8g8b8 _cairo_pixman_fetch_x8r8g8b8
#define FbFillColor _cairo_pixman_fill_color
#define fbIn _cairo_pixman_in
#define fbIn24 _cairo_pixman_in24
#define fbLaneTable _cairo_pixman_lane_table
#define FbMergeRopBits _cairo_pixman_merge_rop_bits
#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
#else
#define _FbOnes _cairo_pixman_ones
#endif
#define fbOver _cairo_pixman_over
#define fbOver24 _cairo_pixman_over24
#define FbPixelsCreate _cairo_pixman_pixels_create
#define FbPixelsCreateForData _cairo_pixman_pixels_create_for_data
#define FbPixelsDestroy _cairo_pixman_pixels_destroy
#define FbPixelsInit _cairo_pixman_pixels_init
#define fbRasterizeEdges _cairo_pixman_rasterize_edges
#define fbRasterizeEdges1 _cairo_pixman_rasterize_edges1
#define fbRasterizeEdges4 _cairo_pixman_rasterize_edges4
#define fbRasterizeEdges8 _cairo_pixman_rasterize_edges8
#define fbRasterizeTrapezoid _cairo_pixman_rasterize_trapezoid
#define FbRasterizeTriangle _cairo_pixman_rasterize_triangle
#define fbReplicatePixel _cairo_pixman_replicate_pixel
#define fbSet _cairo_pixman_set
#define fbSet_external _cairo_pixman_set_external
#define fbSet_transform _cairo_pixman_set_transform
#define fbStepDown _cairo_pixman_step_down
#define fbStepDown_external _cairo_pixman_step_down_external
#define fbStepDown_transform _cairo_pixman_step_down_transform
#define fbStepOver _cairo_pixman_step_over
#define fbStepOver_external _cairo_pixman_step_over_external
#define fbStepOver_transform _cairo_pixman_step_over_transform
#define fbStipple1Bits _cairo_pixman_stipple1_bits
#define fbStipple24Bits _cairo_pixman_stipple24_bits
#define fbStipple2Bits _cairo_pixman_stipple2_bits
#define fbStipple4Bits _cairo_pixman_stipple4_bits
#define fbStipple8Bits _cairo_pixman_stipple8_bits
#define fbStippleTable _cairo_pixman_stipple_table
#define fbStore_a1 _cairo_pixman_store_a1
#define fbStore_a1b1g1r1 _cairo_pixman_store_a1b1g1r1
#define fbStore_a1b5g5r5 _cairo_pixman_store_a1b5g5r5
#define fbStore_a1r1g1b1 _cairo_pixman_store_a1r1g1b1
#define fbStore_a1r5g5b5 _cairo_pixman_store_a1r5g5b5
#define fbStore_a2r2g2b2 _cairo_pixman_store_a2r2g2b2
#define fbStore_a4 _cairo_pixman_store_a4
#define fbStore_a4b4g4r4 _cairo_pixman_store_a4b4g4r4
#define fbStore_a4r4g4b4 _cairo_pixman_store_a4r4g4b4
#define fbStore_a8 _cairo_pixman_store_a8
#define fbStore_a8b8g8r8 _cairo_pixman_store_a8b8g8r8
#define fbStore_a8r8g8b8 _cairo_pixman_store_a8r8g8b8
#define fbStore_b1g2r1 _cairo_pixman_store_b1g2r1
#define fbStore_b2g3r3 _cairo_pixman_store_b2g3r3
#define fbStore_b5g6r5 _cairo_pixman_store_b5g6r5
#define fbStore_b8g8r8 _cairo_pixman_store_b8g8r8
#define fbStore_external _cairo_pixman_store_external
#define fbStore_r1g2b1 _cairo_pixman_store_r1g2b1
#define fbStore_r3g3b2 _cairo_pixman_store_r3g3b2
#define fbStore_r5g6b5 _cairo_pixman_store_r5g6b5
#define fbStore_r8g8b8 _cairo_pixman_store_r8g8b8
#define fbStore_x1b5g5r5 _cairo_pixman_store_x1b5g5r5
#define fbStore_x1r5g5b5 _cairo_pixman_store_x1r5g5b5
#define fbStore_x4b4g4r4 _cairo_pixman_store_x4b4g4r4
#define fbStore_x4r4g4b4 _cairo_pixman_store_x4r4g4b4
#define fbStore_x8b8g8r8 _cairo_pixman_store_x8b8g8r8
#define fbStore_x8r8g8b8 _cairo_pixman_store_x8r8g8b8
#define fbTransparentSpan _cairo_pixman_transparent_span
#define INT_pixman_color_to_pixel _cairo_pixman_color_to_pixel
#define INT_pixman_composite _cairo_pixman_composite
#define pixman_fill_rectangles _cairo_pixman_fill_rectangles
#define pixman_format_init _cairo_pixman_format_init
#define pixman_image_create _cairo_pixman_image_create
#define pixman_image_destroy _cairo_pixman_image_destroy
#define pixman_image_set_component_alpha _cairo_pixman_image_set_component_alpha
#define pixman_image_set_repeat _cairo_pixman_image_set_repeat
#define pixman_region_copy _cairo_pixman_region_copy
#define pixman_region_create_simple _cairo_pixman_region_create_simple
#define pixman_region_union _cairo_pixman_region_union
#define miIsSolidAlpha _cairo_pixman_is_solid_alpha
#define pixman_add_trapezoids _cairo_pixman_add_trapezoids
#define pixman_bits_per_pixel _cairo_pixman_bits_per_pixel
#define pixman_break _cairo_pixman_break
#define pixman_brokendata _cairo_pixman_brokendata
#define pixman_brokenregion _cairo_pixman_brokenregion
#define pixman_coalesce _cairo_pixman_coalesce
#define pixman_color_rects _cairo_pixman_color_rects
#define pixman_color_to_pixel _cairo_pixman_color_to_pixel
#define pixman_composite _cairo_pixman_composite
#define pixman_compositeGeneral _cairo_pixman_composite_general
#define pixman_composite_trapezoids _cairo_pixman_composite_trapezoids
#define pixman_composite_triangles _cairo_pixman_composite_triangles
#define pixman_composite_tri_fan _cairo_pixman_composite_tri_fan
#define pixman_composite_tri_strip _cairo_pixman_composite_tri_strip
#define pixman_fill_rect_32bpp _cairo_pixman_fill_rect_32bpp
#define pixman_fill_rect_8bpp _cairo_pixman_fill_rect_8bpp
#define pixman_fill_rectangle _cairo_pixman_fill_rectangle
#define pixman_fill_rectangles _cairo_pixman_fill_rectangles
#define pixman_fill_rect_general _cairo_pixman_fill_rect_general
#define pixman_format_create _cairo_pixman_format_create
#define pixman_format_create_masks _cairo_pixman_format_create_masks
#define pixman_format_destroy _cairo_pixman_format_destroy
#define pixman_format_get_masks _cairo_pixman_format_get_masks
#define pixman_format_init _cairo_pixman_format_init
#define pixman_image_create _cairo_pixman_image_create
#define pixman_image_create_for_data _cairo_pixman_image_create_for_data
#define pixman_image_createForPixels _cairo_pixman_image_create_for_pixels
#define pixman_image_destroy _cairo_pixman_image_destroy
#define pixman_image_destroyClip _cairo_pixman_image_destroy_clip
#define pixman_image_get_data _cairo_pixman_image_get_data
#define pixman_image_get_depth _cairo_pixman_image_get_depth
#define pixman_image_get_format _cairo_pixman_image_get_format
#define pixman_image_get_height _cairo_pixman_image_get_height
#define pixman_image_get_stride _cairo_pixman_image_get_stride
#define pixman_image_get_width _cairo_pixman_image_get_width
#define pixman_image_init _cairo_pixman_image_init
#define pixman_image_set_clip_region _cairo_pixman_image_set_clip_region
#define pixman_image_set_component_alpha _cairo_pixman_image_set_component_alpha
#define pixman_image_set_filter _cairo_pixman_image_set_filter
#define pixman_image_set_repeat _cairo_pixman_image_set_repeat
#define pixman_image_set_transform _cairo_pixman_image_set_transform
#define pixman_init _cairo_pixman_init
#define pixman_line_fixed_x _cairo_pixman_line_fixed_x
#define pixman_op _cairo_pixman_op
#define pixman_pixel_to_color _cairo_pixman_pixel_to_color
#define pixman_point_fixed_bounds _cairo_pixman_point_fixed_bounds
#define pixman_rect_alloc _cairo_pixman_rect_alloc
#define pixman_region_append _cairo_pixman_region_append
#define pixman_region_contains_point _cairo_pixman_region_contains_point
#define pixman_region_contains_rectangle _cairo_pixman_region_contains_rectangle
#define pixman_region_copy _cairo_pixman_region_copy
#define pixman_region_create _cairo_pixman_region_create
#define pixman_region_create_simple _cairo_pixman_region_create_simple
#define pixman_region_destroy _cairo_pixman_region_destroy
#define pixman_region_empty _cairo_pixman_region_empty
#define pixman_region_emptyBox _cairo_pixman_region_empty_box
#define pixman_region_emptyData _cairo_pixman_region_empty_data
#define pixman_region_extents _cairo_pixman_region_extents
#define pixman_region_intersect _cairo_pixman_region_intersect
#define pixman_region_intersectO _cairo_pixman_region_intersect_o
#define pixman_region_inverse _cairo_pixman_region_inverse
#define pixman_region_not_empty _cairo_pixman_region_not_empty
#define pixman_region_num_rects _cairo_pixman_region_num_rects
#define pixman_region_rects _cairo_pixman_region_rects
#define pixman_region_reset _cairo_pixman_region_reset
#define pixman_region_subtract _cairo_pixman_region_subtract
#define pixman_region_subtractO _cairo_pixman_region_subtract_o
#define pixman_region_translate _cairo_pixman_region_translate
#define pixman_region_union _cairo_pixman_region_union
#define pixman_region_unionO _cairo_pixman_region_union_o
#define pixman_region_union_rect _cairo_pixman_region_union_rect
#define pixman_region_validate _cairo_pixman_region_validate
#define pixman_set_extents _cairo_pixman_set_extents
#define pixman_transform_point _cairo_pixman_transform_point
#define pixman_trapezoid_bounds _cairo_pixman_trapezoid_bounds
#define pixman_triangle_bounds _cairo_pixman_triangle_bounds
#define pixman_uninit _cairo_pixman_uninit
#define QuickSortRects _cairo_pixman_quick_sort_rects
#define QuickSortSpans _cairo_pixman_quick_sort_spans
#define RenderEdgeInit _cairo_pixman_render_edge_init
#define _RenderEdgeMultiInit _cairo_pixman_render_edge_multi_init
#define RenderEdgeStep _cairo_pixman_render_edge_step
#define RenderLineFixedEdgeInit _cairo_pixman_render_line_fixed_edge_init
#define RenderSampleCeilY _cairo_pixman_render_sample_ceil_y
#define RenderSampleFloorY _cairo_pixman_render_sample_floor_y
Index: pixman.h
===================================================================
RCS file: /cvs/cairo/cairo/pixman/src/pixman.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- pixman.h 25 Jun 2005 01:21:16 -0000 1.21
+++ pixman.h 10 Aug 2005 19:36:51 -0000 1.22
@@ -91,6 +91,7 @@
# endif
#endif
+#include "pixman-remap.h"
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
- Previous message: [cairo-commit] cairo ChangeLog, 1.865, 1.866 Makefile.am, 1.14,
1.15 cairo.pc.in, 1.20, 1.21 configure.in, 1.121, 1.122
- Next message: [cairo-commit] cairo/src Makefile.am,1.59,1.60
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the cairo-commit
mailing list