[Commit] cairo ChangeLog, 1.36, 1.37 cairo.pc.in, 1.1,
1.2 configure.in, 1.6, 1.7
Carl Worth
commit at keithp.com
Wed Jul 30 09:30:53 PDT 2003
- Previous message: [Commit] slim/src - New directory
- Next message: [Commit] cairo/src cairo_slope.c, NONE, 1.1 Makefile.am, 1.6,
1.7 cairo.c, 1.2, 1.3 cairo.h, 1.2, 1.3 cairo_color.c, 1.1,
1.2 cairo_font.c, 1.1, 1.2 cairo_gstate.c, 1.2,
1.3 cairo_path.c, 1.2, 1.3 cairo_path_bounds.c, 1.2,
1.3 cairo_path_fill.c, 1.2, 1.3 cairo_path_stroke.c, 1.2,
1.3 cairo_pen.c, 1.3, 1.4 cairo_polygon.c, 1.1,
1.2 cairo_spline.c, 1.2, 1.3 cairo_surface.c, 1.1,
1.2 cairo_traps.c, 1.6, 1.7 cairoint.h, 1.5, 1.6 cairo_misc.c,
1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: cworth
Update of /local/src/CVS/cairo
In directory home.keithp.com:/tmp/cvs-serv21417
Modified Files:
ChangeLog cairo.pc.in configure.in
Log Message:
Made all changes necessary to abandon the Xc library,
(sucking the functionality up into cairo_surface_t instead).
Eliminated most of the remaining X datatypes (XFixed, XPointFixed, XLineFixed, XTrapezoid).
Fixed some numerical problems relating to pen initialization and intersection calculation.
Index: ChangeLog
===================================================================
RCS file: /local/src/CVS/cairo/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- ChangeLog 25 Jul 2003 20:29:07 -0000 1.36
+++ ChangeLog 30 Jul 2003 15:30:50 -0000 1.37
@@ -1,3 +1,74 @@
+2003-07-30 Carl Worth <cworth at isi.edu>
+
+ * src/cairo_traps.c (_line_segs_intersect_ceil): Add one more
+ conditional intersect to push past some fill bugs.
+
+ * src/cairo_surface.c (cairo_surface_create_for_drawable):
+ (cairo_surface_create_for_image):
+ (cairo_surface_put_image):
+ (_cairo_surface_pull_image):
+ (_cairo_surface_push_image):
+ (cairo_surface_set_matrix):
+ (cairo_surface_get_matrix):
+ (cairo_surface_set_repeat):
+ (_cairo_surface_composite):
+ (_cairo_surface_fill_rectangle):
+ (_cairo_surface_fill_rectangles):
+ (_cairo_surface_composite_trapezoids): Absorb all functionality
+ previously in the Xc library.
+
+ * src/cairo_pen.c (_cairo_pen_init): Don't store floating point
+ theta in the pen. Instead, sort vertices by fixed point slope
+ comparisons.
+ (_cairo_pen_add_points): Fixed to remove duplicate pen vertices
+ appearing at beginning and end of vertex array.
+ (_pen_vertex_compare): New fixed-point "angle" comparison for pen
+ vertices. A bit trickier than before, but much more accurate.
+
+ * src/cairo_path_stroke.c (_cairo_stroker_face_clockwise): Share
+ clockwise calculation with other modules.
+
+ * src/cairo_path_bounds.c:
+ * src/cairo_path_fill.c:
+ * src/cairo_path_stroke.c:
+ * src/cairo_pen.c:
+ * src/cairo_polygon.c:
+ * src/cairo_spline.c:
+ * src/cairo_traps.c:
+ * src/cairo_path.c: Replaced all references to
+ XFixed, XPointFixed, XLineFixed, and XTrapezoid with new
+ cairo_fixed_t, cairo_point_t, cairo_line_t, and cairo_trapezoid_t.
+
+ * src/cairo_path.c: (_cairo_path_interpret): Made the path
+ interpreter callback names consistent, (eg. add_edge rather than
+ AddEdge).
+
+ * src/cairo_gstate.c (_cairo_gstate_text_extents): Now silently
+ exits for a non X surface, (avoids a crash until we can implement
+ the libic text backend).
+
+ * src/cairo_gstate.c (_cairo_gstate_end_group):
+ (_cairo_gstate_clip_and_composite_trapezoids):
+ (_cairo_gstate_show_surface): Replaced all XcCalls with
+ corresponding cairo_surface_calls.
+
+ * src/cairo_gstate.c (_cairo_gstate_transform_point):
+ (_cairo_gstate_transform_font):
+ (_cairo_gstate_text_extents): Renamed from the garbled names
+ (eg. cairo_gstateransform_point) leftover from the great renaming.
+
+ * src/cairo_color.c (_cairo_color_set_rgb): Reworked cairo_color_t
+ to eliminate reference to an XcColor object.
+
+ * src/cairo.h: Dropped include of <Xc.h>, added
+ <X11/extensions/Xrender.h>, <fontconfig/fontconfig.h>, and <ic.h>
+
+ * src/cairo.c (cairo_get_fill_rule): Added missing cairo_get_fill_rule.
+
+ * configure.in (PKG_CHECK_MODULES): Drops xc, add libic
+
+ * cairo.pc.in (Requires): Drop xc, add libic.
+
2003-07-25 Carl Worth <cworth at isi.edu>
* src/cairo_traps.c (_line_segs_intersect_ceil): We don't need a
Index: cairo.pc.in
===================================================================
RCS file: /local/src/CVS/cairo/cairo.pc.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cairo.pc.in 18 Jul 2003 18:34:19 -0000 1.1
+++ cairo.pc.in 30 Jul 2003 15:30:50 -0000 1.2
@@ -7,7 +7,7 @@
Description: Multi-platform 2D graphics library
Version: @VERSION@
-Requires: xc xft
+Requires: libic xft
Libs: -L${libdir} -lcairo -lm
Cflags: -I${includedir}
Index: configure.in
===================================================================
RCS file: /local/src/CVS/cairo/configure.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- configure.in 18 Jul 2003 18:34:19 -0000 1.6
+++ configure.in 30 Jul 2003 15:30:50 -0000 1.7
@@ -24,7 +24,7 @@
dnl ===========================================================================
-XC_REQUIRED=0.1.0
+LIBIC_REQUIRES=0.1.0
XFT_REQUIRED=2.1.1
dnl ===========================================================================
@@ -45,7 +45,7 @@
dnl ===========================================================================
-PKG_CHECK_MODULES(CAIRO, xc >= $XC_REQUIRED xft >= $XFT_REQUIRED)
+PKG_CHECK_MODULES(CAIRO, xft >= $XFT_REQUIRED, libic >= $LIBIC_REQUIRED)
AC_SUBST(CAIRO_CFLAGS)
AC_SUBST(CAIRO_LIBS)
- Previous message: [Commit] slim/src - New directory
- Next message: [Commit] cairo/src cairo_slope.c, NONE, 1.1 Makefile.am, 1.6,
1.7 cairo.c, 1.2, 1.3 cairo.h, 1.2, 1.3 cairo_color.c, 1.1,
1.2 cairo_font.c, 1.1, 1.2 cairo_gstate.c, 1.2,
1.3 cairo_path.c, 1.2, 1.3 cairo_path_bounds.c, 1.2,
1.3 cairo_path_fill.c, 1.2, 1.3 cairo_path_stroke.c, 1.2,
1.3 cairo_pen.c, 1.3, 1.4 cairo_polygon.c, 1.1,
1.2 cairo_spline.c, 1.2, 1.3 cairo_surface.c, 1.1,
1.2 cairo_traps.c, 1.6, 1.7 cairoint.h, 1.5, 1.6 cairo_misc.c,
1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Commit
mailing list