[cairo-commit] cairo ChangeLog, 1.170, 1.171 cairo.pc.in, 1.12, 1.13 configure.in, 1.46, 1.47

[David Reveman]

Committed by: davidr

Update of /cvs/cairo/cairo
In directory pdx:/tmp/cvs-serv17981

Modified Files:
	ChangeLog cairo.pc.in configure.in 
Log Message:
Added new pattern API

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.170
retrieving revision 1.171
diff -C2 -d -r1.170 -r1.171
*** a/ChangeLog	2 Apr 2004 16:01:09 -0000	1.170
--- b/ChangeLog	6 Apr 2004 16:36:12 -0000	1.171
***************
*** 1,2 ****
--- 1,84 ----
+ 2004-04-04  David Reveman  <c99drn at cs.umu.se>
+ 
+ 	* src/cairoint.h: Added create_pattern backend function and pattern
+ 	prototypes.
+ 
+ 	* src/cairo_xlib_surface.c: Added _cairo_xlib_surface_create_pattern.
+ 
+ 	* src/cairo_xcb_surface.c: Added _cairo_xcb_surface_create_pattern.
+ 
+ 	* src/cairo_traps.c: Added _cairo_trap_extents and 
+ 	_cairo_traps_extents.
+ 
+ 	* src/cairo_surface.c: Added _cairo_surface_create_pattern.
+ 
+ 	* src/cairo_ps_surface.c: Added _cairo_ps_surface_create_pattern.
+ 
+ 	* src/cairo_png_surface.c: Added _cairo_png_surface_create_pattern.
+ 
+ 	* src/cairo_pattern.c (added): All functions needed for the new
+ 	pattern API.
+ 
+ 	* src/cairo_image_surface.c: Added
+ 	_cairo_image_abstract_surface_create_pattern.
+ 
+ 	* src/cairo_gstate.c (_cairo_gstate_init): Create solid pattern
+ 	and set alpha to 0.0.
+ 	(_cairo_gstate_init_copy): Increment pattern references.
+ 	(_cairo_gstate_fini): Destroy pattern.
+ 	(_cairo_gstate_set_pattern): Destroy current pattern,
+ 	increment references to the new pattern and update pattern
+ 	offset with the current point.
+ 	(_cairo_gstate_set_rgb_color): Destroy current pattern and
+ 	create a new solid pattern.
+ 	(_cairo_gstate_current_rgb_color): Get RGB from current pattern.
+ 	(_cairo_gstate_set_alpha): Set gstate->alpha without modifying
+ 	the current pattern.
+ 	(_cairo_gstate_stroke):
+ 	(_cairo_gstate_fill): Removed surface matrix computations as
+ 	they are now handled by _cairo_gstate_create_pattern.
+ 	(_cairo_gstate_clip_and_composite_trapezoids): Create a
+ 	possibly backend accelerated pattern source and use it for
+ 	compositing trapezoids.
+ 	(_cairo_gstate_clip): Allow backends to not support rectangular
+ 	clipping regions. Use solid pattern for creating clip surface.
+ 	(_cairo_gstate_show_surface): Use solid pattern for alpha mask.
+ 	(_cairo_gstate_show_text):
+ 	(_cairo_gstate_show_glyphs): Use current pattern when compositing
+ 	glyphs.
+ 
+ 	Added _cairo_gstate_current_pattern and _cairo_gstate_create_pattern,
+ 	_cairo_gstate_stroke_extents, _cairo_gstate_fill_extents.
+ 	Removed restore_text_rendering_context, setup_text_rendering_context,
+ 	_cairo_gstate_ensure_source.
+ 
+ 	* src/cairo_ft_font.c (_cairo_ft_font_show_glyphs): Advance
+ 	source offset.
+ 
+ 	* src/cairo.h: Added cairo_current_pattern,
+ 	cairo_pattern_create_for_surface, cairo_pattern_create_linear,
+ 	cairo_pattern_create_radial, cairo_pattern_reference,
+ 	cairo_pattern_destroy, cairo_pattern_add_color_stop,
+ 	cairo_pattern_set_matrix, cairo_pattern_get_matrix,
+ 	cairo_pattern_set_extend, cairo_pattern_get_extend,
+ 	cairo_pattern_set_filter, cairo_pattern_get_filter. cairo_set_pattern
+ 	now takes a cairo_pattern_t pointer instead of a cairo_surface_t
+ 	pointer. Added CAIRO_FILTER_GAUSSIAN filter type. Added cairo_extend_t
+ 	enum.
+ 
+ 	* src/cairo.c: _cairo_restrict_value declared not static as it's
+ 	used in cairo_pattern.c. Added rectangular extents functions
+ 	cairo_stroke_extents and cairo_fill_extents. cairo_set_pattern now
+ 	takes a cairo_pattern_t pointer instead of a cairo_surface_t
+ 	pointer. Added cairo_current_pattern function.
+ 
+ 	* src/Makefile.am (libcairo_la_LIBADD): Removed -lz and added PS_LIBS.
+ 
+ 	* configure.in: Bump version to 0.1.20. Includes new pattern
+ 	API. Removed an extra AC_SUBST(XRENDER_LIBS). 
+ 	PS_SURFACE_LIBS -> PS_LIBS.
+ 
+ 	* cairo.pc.in: PS_SURFACE_LIBS -> PS_LIBS.
+ 
  2004-04-02  Carl Worth  <cworth at east.isi.edu>
  

Index: cairo.pc.in
===================================================================
RCS file: /cvs/cairo/cairo/cairo.pc.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** a/cairo.pc.in	31 Mar 2004 02:45:00 -0000	1.12
--- b/cairo.pc.in	6 Apr 2004 16:36:12 -0000	1.13
***************
*** 9,13 ****
  
  Requires: fontconfig libpixman @XRENDER_REQUIRES@ @PNG_REQUIRES@
! Libs: -L${libdir} -lcairo -lm @PS_SURFACE_LIBS@ @FREETYPE_LIBS@ @XRENDER_LIBS@
  Cflags: -I${includedir} @FREETYPE_CFLAGS@
  
--- 9,13 ----
  
  Requires: fontconfig libpixman @XRENDER_REQUIRES@ @PNG_REQUIRES@
! Libs: -L${libdir} -lcairo -lm @XRENDER_LIBS@ @PS_LIBS@ @FREETYPE_LIBS@
  Cflags: -I${includedir} @FREETYPE_CFLAGS@
  

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** a/configure.in	31 Mar 2004 02:45:00 -0000	1.46
--- b/configure.in	6 Apr 2004 16:36:12 -0000	1.47
***************
*** 4,8 ****
  
  # Package version number, (as distinct from shared library version)
! CAIRO_VERSION=0.1.19
  
  # libtool shared library version
--- 4,8 ----
  
  # Package version number, (as distinct from shared library version)
! CAIRO_VERSION=0.1.20
  
  # libtool shared library version
***************
*** 60,64 ****
  AC_SUBST(XRENDER_LIBS)
  AC_SUBST(XRENDER_REQUIRES)
- AC_SUBST(XRENDER_LIBS)
  
  dnl ===========================================================================
--- 60,63 ----
***************
*** 92,101 ****
  else
    PS_SURFACE_FEATURE=CAIRO_HAS_PS_SURFACE
!   PS_SURFACE_LIBS=-lz
    AM_CONDITIONAL(CAIRO_HAS_PS_SURFACE, true)
  fi
  
- AC_SUBST(PS_SURFACE_LIBS)
  AC_SUBST(PS_SURFACE_FEATURE)
  
  dnl ===========================================================================
--- 91,100 ----
  else
    PS_SURFACE_FEATURE=CAIRO_HAS_PS_SURFACE
!   PS_LIBS=-lz
    AM_CONDITIONAL(CAIRO_HAS_PS_SURFACE, true)
  fi
  
  AC_SUBST(PS_SURFACE_FEATURE)
+ AC_SUBST(PS_LIBS)
  
  dnl ===========================================================================