[cairo-commit] 5 commits - configure.in Makefile.am pixman/AUTHORS pixman/autogen.sh pixman/ChangeLog pixman/ChangeLog.libic pixman/ChangeLog.libpixregion pixman/ChangeLog.slim pixman/configure.in pixman/COPYING pixman/.gitignore pixman/INSTALL pixman/libpixman.pc.in pixman/Makefile.am pixman/NEWS pixman/README pixman/RELEASING pixman/src pixman/TODO pixman/update.pl src/cairo-clip.c src/cairo-glitz-surface.c src/cairo-image-surface.c src/cairoint.h src/cairo-pattern.c src/cairo-pdf-surface.c src/cairo-ps-surface.c src/cairo-surface.c src/cairo-surface-fallback.c src/cairo-svg-surface.c src/cairo-traps.c src/cairo-xlib-surface.c src/Makefile.am test/buffer-diff.c

Søren Sandmann Pedersen sandmann at kemper.freedesktop.org
Mon Jul 2 12:26:37 PDT 2007


 Makefile.am                        |    4 
 configure.in                       |   14 
 pixman/.gitignore                  |   20 
 pixman/AUTHORS                     |   19 
 pixman/COPYING                     |   92 
 pixman/ChangeLog                   | 1534 -------------
 pixman/ChangeLog.libic             |  300 --
 pixman/ChangeLog.libpixregion      |   47 
 pixman/ChangeLog.slim              |   39 
 pixman/INSTALL                     |    9 
 pixman/Makefile.am                 |    7 
 pixman/NEWS                        |  135 -
 pixman/README                      |   47 
 pixman/RELEASING                   |   81 
 pixman/TODO                        |   10 
 pixman/autogen.sh                  |   53 
 pixman/configure.in                |   92 
 pixman/libpixman.pc.in             |   10 
 pixman/src/.gitignore              |   13 
 pixman/src/Makefile.am             |   46 
 pixman/src/Makefile.win32          |   37 
 pixman/src/check-config.sh         |   17 
 pixman/src/check-pixmanint.sh      |   17 
 pixman/src/fbcompose.c             | 4354 -------------------------------------
 pixman/src/fbedge.c                |  303 --
 pixman/src/fbedgeimp.h             |  136 -
 pixman/src/fbmmx.c                 | 2821 -----------------------
 pixman/src/fbmmx.h                 |  298 --
 pixman/src/fbpict.c                | 2181 ------------------
 pixman/src/fbpict.h                |  355 ---
 pixman/src/fbtrap.c                |  236 --
 pixman/src/icblt.c                 |  951 --------
 pixman/src/icbltone.c              |  743 ------
 pixman/src/iccolor.c               |   83 
 pixman/src/icformat.c              |  220 -
 pixman/src/icimage.c               |  744 ------
 pixman/src/icimage.h               |  384 ---
 pixman/src/icint.h                 | 1070 ---------
 pixman/src/icpixels.c              |  116 
 pixman/src/icrect.c                |  404 ---
 pixman/src/icrop.h                 |  137 -
 pixman/src/icstipple.c             |   81 
 pixman/src/ictransform.c           |   63 
 pixman/src/ictrap.c                |  200 -
 pixman/src/ictri.c                 |  293 --
 pixman/src/icutil.c                |  287 --
 pixman/src/pixman-remap.h          |   81 
 pixman/src/pixman-xserver-compat.h |  125 -
 pixman/src/pixman.h                |  553 ----
 pixman/src/pixmanint.h             | 1093 ---------
 pixman/src/pixregion.c             | 2559 ---------------------
 pixman/src/pixregionint.h          |   74 
 pixman/src/renderedge.c            |  196 -
 pixman/src/renderedge.h            |  157 -
 pixman/update.pl                   |  159 -
 src/Makefile.am                    |    6 
 src/cairo-clip.c                   |   36 
 src/cairo-glitz-surface.c          |  126 -
 src/cairo-image-surface.c          |  316 +-
 src/cairo-pattern.c                |   84 
 src/cairo-pdf-surface.c            |   40 
 src/cairo-ps-surface.c             |    2 
 src/cairo-surface-fallback.c       |    5 
 src/cairo-surface.c                |    9 
 src/cairo-svg-surface.c            |   31 
 src/cairo-traps.c                  |    4 
 src/cairo-xlib-surface.c           |   43 
 src/cairoint.h                     |   14 
 test/buffer-diff.c                 |   16 
 69 files changed, 400 insertions(+), 24432 deletions(-)

New commits:
diff-tree ef967be630dd8d0bf81ad5889d6264bebe7631d4 (from parents)
Merge: 0c42dbb1925efb8228fb5246e0715bee0a5ded28 5c7d2d14d78e4dfb1ef6d2c40f0910f177e07360
Author: Søren Sandmann Pedersen <sandmann at annarchy.freedesktop.org>
Date:   Mon Jul 2 08:33:29 2007 -0700

    Merge branch 'master' of git+ssh://sandmann@git.freedesktop.org/git/cairo
    
    Conflicts:
    
    	pixman/src/fbcompose.c
    	pixman/src/icimage.c
    	pixman/src/pixmanint.h
    	pixman/src/pixregionint.h
    	src/cairo-clip.c

diff --cc pixman/src/pixman-remap.h
index 237b7bf,237b7bf..0000000
deleted file mode 100644,100644
diff --cc pixman/src/pixman.h
index feaf60a,491fc89..0000000
deleted file mode 100644,100644
diff --cc pixman/src/pixregion.c
index 4cd08e5,1ed3ad7..0000000
deleted file mode 100644,100644
diff --cc src/cairo-clip.c
index 6aa264e,8394077..abc5033
@@@ -623,10 -633,14 +623,14 @@@
      if (clip->path || clip->surface)
          return (cairo_rectangle_list_t*) &_cairo_rectangles_not_representable;
  
 -    n_boxes = clip->has_region ? pixman_region_num_rects (&clip->region) : 1;
 +    n_boxes = clip->has_region ? pixman_region_n_rects (&clip->region) : 1;
-     rectangles = malloc (sizeof (cairo_rectangle_t)*n_boxes);
-     if (rectangles == NULL)
-         return (cairo_rectangle_list_t*) &_cairo_rectangles_nil;
+     if (n_boxes > 0) {
+ 	rectangles = _cairo_malloc_ab (n_boxes, sizeof (cairo_rectangle_t));
+ 	if (rectangles == NULL)
+ 	    return (cairo_rectangle_list_t*) &_cairo_rectangles_nil;
+     } else {
+ 	rectangles = NULL;
+     }
  
      if (clip->has_region) {
          pixman_box16_t *boxes;
diff --cc src/cairo-glitz-surface.c
index 573ee81,de91fc7..7135180
@@@ -235,10 -194,10 +235,10 @@@
  
      /* XXX: we should eventually return images with negative stride,
         need to verify that libpixman have no problem with this first. */
 -    pf.bytes_per_line = (((width * format.bpp) / 8) + 3) & -4;
 +    pf.bytes_per_line = (((width * masks.bpp) / 8) + 3) & -4;
      pf.scanline_order = GLITZ_PIXEL_SCANLINE_ORDER_TOP_DOWN;
  
-     pixels = malloc (height * pf.bytes_per_line);
+     pixels = _cairo_malloc_ab (height, pf.bytes_per_line);
      if (!pixels)
  	return CAIRO_STATUS_NO_MEMORY;
  
diff --cc src/cairo-xlib-surface.c
index c70d640,3e77165..4c7a699
@@@ -1786,9 -1758,9 +1789,9 @@@
  	XRectangle *rects = NULL;
  	int n_boxes, i;
  
 -	n_boxes = pixman_region_num_rects (region);
 +	n_boxes = pixman_region_n_rects (region);
  	if (n_boxes > ARRAY_LENGTH (surface->embedded_clip_rects)) {
- 	    rects = malloc (sizeof(XRectangle) * n_boxes);
+ 	    rects = _cairo_malloc_ab (n_boxes, sizeof(XRectangle));
  	    if (rects == NULL)
  		return CAIRO_STATUS_NO_MEMORY;
  	}else {
diff-tree 0c42dbb1925efb8228fb5246e0715bee0a5ded28 (from e0cff78b34558f0eed29aff5d818d1591c7bf966)
Author: Søren Sandmann <sandmann at redhat.com>
Date:   Fri Jun 15 00:39:27 2007 -0400

    pixman_image_set_transform() returns FALSE on failure

diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c
index 4bc8351..6ac0698 100644
--- a/src/cairo-pattern.c
+++ b/src/cairo-pattern.c
@@ -1223,7 +1223,7 @@ _cairo_pattern_acquire_surface_for_gradi
     pixman_image_set_filter (pixman_image, PIXMAN_FILTER_BILINEAR, NULL, 0);
 
     _cairo_matrix_to_pixman_matrix (&pattern->base.matrix, &pixman_transform);
-    if (pixman_image_set_transform (pixman_image, &pixman_transform)) {
+    if (!pixman_image_set_transform (pixman_image, &pixman_transform)) {
 	cairo_surface_destroy (&image->base);
 	pixman_image_unref (pixman_image);
 	return CAIRO_STATUS_NO_MEMORY;
diff-tree e0cff78b34558f0eed29aff5d818d1591c7bf966 (from ca5760a289f287a7fafe36e69c6bdf47710c17e7)
Author: Søren Sandmann <sandmann at redhat.com>
Date:   Thu Jun 14 13:42:08 2007 -0400

    Fix bug where _cairo_image_surface_composite_trapezoids() computed the wrong stride for aliased masks

diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c
index 087f9d6..e3178ff 100644
--- a/src/cairo-image-surface.c
+++ b/src/cairo-image-surface.c
@@ -914,7 +914,7 @@ _cairo_image_surface_composite_trapezoid
 	format = PIXMAN_a1;
 	ret = 1;
 	assert (ret);
-	mask_stride = (width + 31)/8;
+	mask_stride = ((width + 31) / 8) & ~0x03;
 	mask_bpp = 1;
  	break;
     case CAIRO_ANTIALIAS_GRAY:
diff-tree ca5760a289f287a7fafe36e69c6bdf47710c17e7 (from 12cc32b674d3f1b705ef1a66bbce1ef8c4488daf)
Author: Søren Sandmann <sandmann at redhat.com>
Date:   Thu Jun 14 13:12:01 2007 -0400

    Fix initialization of radial patterns

diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c
index db71478..4bc8351 100644
--- a/src/cairo-pattern.c
+++ b/src/cairo-pattern.c
@@ -273,7 +273,7 @@ _cairo_pattern_init_radial (cairo_radial
 
     pattern->c1.x = _cairo_fixed_from_double (cx0);
     pattern->c1.y = _cairo_fixed_from_double (cy0);
-    pattern->radius2 = _cairo_fixed_from_double (fabs (radius0));
+    pattern->radius1 = _cairo_fixed_from_double (fabs (radius0));
     pattern->c2.x = _cairo_fixed_from_double (cx1);
     pattern->c2.y = _cairo_fixed_from_double (cy1);
     pattern->radius2 = _cairo_fixed_from_double (fabs (radius1));
diff-tree 12cc32b674d3f1b705ef1a66bbce1ef8c4488daf (from 9109946a1a7f9341e60da7358da6535c5fac52db)
Author: Søren Sandmann <sandmann at redhat.com>
Date:   Wed Jun 13 00:15:34 2007 -0400

    [pixman] Initial port to standalone pixman library.

diff --git a/Makefile.am b/Makefile.am
index 4410c02..0ec2404 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
-DIST_SUBDIRS = pixman src boilerplate test perf doc util
-SUBDIRS = pixman src doc
+DIST_SUBDIRS = src boilerplate test perf doc util
+SUBDIRS = src doc
 # libpng is required for our test programs
 if CAIRO_HAS_PNG_FUNCTIONS
 SUBDIRS += boilerplate test perf
diff --git a/configure.in b/configure.in
index bef5d55..a521cc4 100644
--- a/configure.in
+++ b/configure.in
@@ -102,6 +102,7 @@ if test "x$PKG_CONFIG" = x; then
 	AC_MSG_ERROR([pkg-config >= $PKGCONFIG_REQUIRED required but not found (http://pkgconfig.freedesktop.org/)])
 fi
 
+
 dnl ===========================================================================
 dnl
 dnl cairo_cache_version should be increased every time that the backend
@@ -232,8 +233,15 @@ CAIRO_NONPKGCONFIG_LIBS="$LIBM"
 CAIRO_LDADD=""
 CAIRO_CFLAGS=$CAIRO_NONPKGCONFIG_CFLAGS
 CAIRO_LIBS=$CAIRO_NONPKGCONFIG_LIBS
-PIXMAN_CFLAGS=""
-PIXMAN_LDADD=""
+
+dnl ===========================================================================
+
+PKG_CHECK_MODULES(PIXMAN, pixman >= 0.9.2)
+
+CAIRO_NONPKGCONFIG_CFLAGS="PIXMAN_CFLAGS $CAIRO_NONPKGCONFIG_CFLAGS"
+CAIRO_NONPKGCONFIG_LIBS="PIXMAN_LIBS $CAIRO_NONPKGCONFIG_LIBS"
+CAIRO_CFLAGS="$PIXMAN_CFLAGS $CAIRO_CFLAGS"
+CAIRO_LIBS="$PIXMAN_LIBS $CAIRO_LIBS"
 
 dnl ===========================================================================
 
@@ -919,8 +927,6 @@ _EOF
 AC_CONFIG_FILES([
 Makefile
 boilerplate/Makefile
-pixman/Makefile
-pixman/src/Makefile
 src/Makefile
 test/Makefile
 test/pdiff/Makefile
diff --git a/pixman/.gitignore b/pixman/.gitignore
deleted file mode 100644
index 55c6a04..0000000
--- a/pixman/.gitignore
+++ /dev/null
@@ -1,20 +0,0 @@
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-config.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-libpixman.pc
-libtool
-ltmain.sh
-releases
-stamp-h
-stamp-h.in
-stamp-h1
-*~
diff --git a/pixman/AUTHORS b/pixman/AUTHORS
deleted file mode 100644
index d858e59..0000000
--- a/pixman/AUTHORS
+++ /dev/null
@@ -1,19 +0,0 @@
-David R Bacon <dbacon at cis.ksu.edu> Fixes to compile on x86_64.
-Billy Biggs <vektor at dumbterm.net> Fix to use stdint datatypes.
-Dave Beckett <Dave.Beckett at bristol.ac.uk> Combined libpixregion, libic, and slim.
-Jakub Bogusz <qboosh at pld-linux.org> Fixes for 64-bit machines.
-Anders Carlsson <andersca at gnome.org> Build fixes. New accessor functions.
-Richard Henderson <rth at twiddle.net> "slim" macros for better shared libraries 
-Owen Taylor <otaylor at redhat.com> Support for both transform and repeat
-Keith Packard <keithp at keithp.com> The original implementation of the compositing code.
-David Reveman <c99drn at cs.umu.se> Byte-order, clipping and format fixes.
-Vladimir Vukicevic <vladimir at pobox.com> Bug fix.
-Bryan Worth <bryan at theworths.org> Cleanups to not depend on X header files.
-Carl Worth <carl at theworths.org> General maintenance. Original port from X server code.
-Richard Worth <richard at theworths.org> Build fixes for cygwin.
-
-and the "X Window System authors" (pixregion code)
-
-(Please let us know if we have missed anyone. I would be interested in
-having more precise attribution for the pixregion code if anyone knows
-who wrote that.)
diff --git a/pixman/COPYING b/pixman/COPYING
deleted file mode 100644
index 5d8dca6..0000000
--- a/pixman/COPYING
+++ /dev/null
@@ -1,92 +0,0 @@
-libpixregion
-
-Copyright 1987, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-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
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-----------------------------------------------------------------------
-libic
-
-Copyright © 2001 Keith Packard
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Keith Packard not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Keith Packard makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-----------------------------------------------------------------------
-slim
-
-slim is Copyright © 2003 Richard Henderson
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Richard Henderson not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  Richard Henderson
-makes no representations about the suitability of this software for
-any purpose.  It is provided "as is" without express or implied
-warranty.
-
-RICHARD HENDERSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL RICHARD HENDERSON BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
diff --git a/pixman/ChangeLog b/pixman/ChangeLog
deleted file mode 100644
index 80949bd..0000000
--- a/pixman/ChangeLog
+++ /dev/null
@@ -1,1534 +0,0 @@
-2006-01-09  Anders Carlsson  <andersca at imendio.com>
-
-        * src/icimage.c:
-        (premultiply):
-        (INTERPOLATE_PIXEL_256):
-        Use uint32_t instead of uint;
-
-2006-01-04  Carl Worth  <cworth at cworth.org>
-
-	* Originally: 2005-10-10  David Reveman  <davidr at novell.com>
-
-	* src/fbcompose.c: (SourcePictureClassify), (fbFetchSolid),
-	(fbFetch), (fbFetchSourcePict), (fbFetchTransformed),
-	(fbFetchExternalAlpha), (fbCompositeRect):
-	* src/icimage.c: (_pixman_init_gradient),
-	(_pixman_create_source_image),
-	(pixman_image_create_linear_gradient),
-	(pixman_image_create_radial_gradient):
-	* src/icimage.h:
-
-	Some major performance improvements to the general composite code
-	used for gradients and transformed images. Like fetching of mask
-	scanline before source scanline so that only the necessary pixels
-	from source needs to be computed in case of gradients or
-	transformed images as source. This patch also include some
-	gradient specific fixes and performance improvement.
-
-2006-01-04  Carl Worth  <cworth at cworth.org>
-
-	* Originally: 2005-10-10  David Reveman  <davidr at novell.com>
-
-	* src/pixman.h: Add entries for gradient support.
-
-	* src/icint.h: Add PictureGradientColor.
-
-	* src/icimage.h:
-	* src/icimage.c: Add necessary functionality for gradient support.
-
-	* src/fbcompose.c: Enable gradient support.
-
-2005-11-21  Carl Worth  <cworth at cworth.org>
-
-	* src/pixman-remap.h: Remove duplicate definitions of
-	pixman_color_to_pixel and pixman_composite.
-
-2005-11-18  Carl Worth  <cworth at cworth.org>
-
-	* src/pixman-remap.h: Remove spurios INT_ prefixes which break the
-	build with very recent binutils.
-
-2005-10-09  Billy Biggs  <vektor at dumbterm.net>
-
-	* src/icimage.h: Make space for the new bits needed by expand.
-
-2005-10-09  Billy Biggs  <vektor at dumbterm.net>
-
-	reviewed by: davidr, cworth, otaylor
-
-	* src/pixman.h: Add extended repeat modes, copied from XRender.
-	* src/icimage.c: (pixman_image_init), (pixman_image_set_repeat),
-	(FbClipImageSrc): Cleanup to use the new repeat modes.
-	* src/icrect.c: (pixman_fill_rectangles): Be explicit about which
-	repeat mode we want.
-
-2005-09-18  Billy Biggs  <vektor at dumbterm.net>
-
-	* src/fbmmx.c: Only include xmmintrin.h if USE_SSE is defined.
-
-2005-09-15  Billy Biggs  <vektor at dumbterm.net>
-
-	Bug #4414, reviewed by otaylor, cworth.
-
-	* src/fbmmx.c: Remove CPU detection code.
-	* src/fbpict.c (detectCPUFeatures), (fbHaveMMX): Move CPU
-	detection code out of the MMX file and into the generic code to
-	avoid compiling it with -mmmx and -msse.  Using these options
-	causes gcc to use MMX and SSE instructions in the CPU detection
-	code which causes SIGILLs on older processors.
-
-2005-08-28  Owen Taylor  <otaylor at redhat.com>
-
-	Bug #4260, Reviewed by B. Biggs
- 
- 	* src/fbcompose.c (fbStore_a8b8g8r8, fbStore_x8b8g8r8): Use & not
- 	&& for bitwise AND.
- 
- 	* src/fbpict.h (fbComposeGetSolid) src/fbpict.c src/fbmmx.c: Take
- 	'dest' as an argument, if pict and dest don't match for RGB, BGR,
- 	swap result.
-	
-2005-08-28  Owen Taylor  <otaylor at redhat.com>
-
-	* src/fbmmx.c (detectCPUFeatures): Use local labels rather than
-	global labels in the assembly, to be robust if the code is inlined
-	in multiple places. (#4283, Reported by Marco Manfredini)
-
-2005-08-27  Billy Biggs  <vektor at dumbterm.net>
-
-	Some fixes for warnings from sparse (Part of bug #4208,
-	Kjartan Maraas)
-
-	* src/fbcompose.c (fetchProcForPicture),
-	(fetchPixelProcForPicture), (storeProcForPicture), (fbFetchSolid),
-	(fbFetch), (fbFetchTransformed), (fbStore), (fbStoreExternalAlpha),
-	(fbCompositeRect):
-	* src/fbpict.c (pixman_composite):
-	* src/icbltone.c (fbLaneTable), (fbBltOne):
-	* src/icimage.c (pixman_image_init), (pixman_image_set_transform):
-	* src/icrect.c (pixman_fill_rectangles):
-	* src/ictrap.c (FbCreateAlphaPicture):   Use NULL not 0.
-
-2005-08-27  Owen Taylor  <otaylor at redhat.com>
-
-	* src/fbmmx.c (detectCPUFeatures): Make the code work with
-	-fomit-frame-pointer by making sure that %esp isn't modified at
-	the point where we access output operands. (#4269, Patch from
-	Ronald Wahl)
-	
-2005-08-22  Owen Taylor  <otaylor at redhat.com>
-
-	* src/pixregion.c (pixman_region_union_rect): When width/height
-	are 0, copy the src to the dest, don't just return. (#3017)
-
-2005-08-21  Billy Biggs  <vektor at dumbterm.net>
-
-	* src/pixman-remap.h: Fix a typo in the last change.
-
-2005-08-21  Billy Biggs  <vektor at dumbterm.net>
-
-	* src/fbpict.c: Remove warning about fbCompositeTrans_0888xnx0888 not
-	being tested on big-endian, it's not helpful at this point.
-
-	* src/pixman-remap.h: Only define _cairo_pixman_have_mmx for fbHaveMMX
-	when the symbol will actually exist.
-
-2005-08-21  Billy Biggs  <vektor at dumbterm.net>
-
-	Fix for bug #4140:
-
-	* src/icrect.c: (pixman_fill_rect_8bpp): Dereference the pixel value
-	correctly on big endian systems.
-
-2005-08-18  Billy Biggs  <vektor at dumbterm.net>
-
-	* src/fbmmx.c: (mmxCombineMaskU), (mmxCombineOverU): Special case
-	alpha values of 0 and 0xff.
-	(fbCompositeSrc_8888x8888mmx): Add an MMX implementation for
-	a common operation when using pixman.
-
-	* src/fbmmx.h: Prototype for the new function.
-
-	* src/fbpict.c: (fbComposite): Call the new function where
-	appropriate.
-
-2005-08-18  Billy Biggs  <vektor at dumbterm.net>
-
-	* src/fbcompose.c: (fbFetchTransformed): Special case projective
-	transforms so we can avoid doing the expensive 64-bit math.
-	Unroll the bilinear interpolation loops for an extra boost.
-
-2005-08-18  Billy Biggs  <vektor at dumbterm.net>
-
-	* src/fbmmx.c: (fbCompositeSolidMaskSrc_nx8x8888mmx): For the source
-	operator, the output should be cleared if the mask is zero.  This
-	fixes the MMX code to match the fbcompose code.
-
-	* src/fbpict.c: (pixman_composite): Fix a logic mistake that caused
-	the MMX functions not to be used in many cases.
-
-2005-08-17  Billy Biggs  <vektor at dumbterm.net>
-
-	* src/pixman-remap.h: Only mangle exported symbols.  This is
-	sufficient and makes debugging a lot easier.
-
-2005-08-16  Billy Biggs  <vektor at dumbterm.net>
-
-	* src/Makefile.am: Fix a typo in the last commit.
-
-2005-08-16  Billy Biggs  <vektor at dumbterm.net>
-
-	* src/Makefile.am: Split the MMX code into a separate libtool
-	library to avoid applying the MMX CFLAGS to all of the pixman
-	code.  Idea and code from Owen Taylor.
-
-	* src/pixman-remap.h: Update the mangling header file to include
-	the MMX symbols.
-
-2005-08-16  Billy Biggs  <vektor at dumbterm.net>
-
-	* src/fbmmx.c: (shift), (negate), (pix_multiply), (pix_add),
-	(expand_alpha), (expand_alpha_rev), (invert_colors), (over),
-	(over_rev_non_pre), (in), (in_over), (load8888), (pack8888),
-	(store8888), (expand565), (expand8888), (pack565), (pix_add_mul),
-	(mmxCombineMaskU), (mmxCombineOverU), (mmxCombineOverReverseU),
-	(mmxCombineInU), (mmxCombineInReverseU), (mmxCombineOutU),
-	(mmxCombineOutReverseU), (mmxCombineAtopU),
-	(mmxCombineAtopReverseU), (mmxCombineXorU), (mmxCombineAddU),
-	(mmxCombineSaturateU), (mmxCombineSrcC), (mmxCombineOverC),
-	(mmxCombineOverReverseC), (mmxCombineInC), (mmxCombineInReverseC),
-	(mmxCombineOutC), (mmxCombineOutReverseC), (mmxCombineAtopC),
-	(mmxCombineAtopReverseC), (mmxCombineXorC), (mmxCombineAddC),
-	(fbComposeSetupMMX), (fbCompositeSolid_nx8888mmx),
-	(fbCompositeSolid_nx0565mmx),
-	(fbCompositeSolidMask_nx8888x8888Cmmx),
-	(fbCompositeSrc_8888x8x8888mmx), (fbCompositeSrc_x888x8x8888mmx),
-	(fbCompositeSolidMask_nx8x8888mmx),
-	(fbCompositeSolidMaskSrc_nx8x8888mmx),
-	(fbCompositeSolidMask_nx8x0565mmx),
-	(fbCompositeSrc_8888RevNPx0565mmx),
-	(fbCompositeSrc_8888RevNPx8888mmx),
-	(fbCompositeSolidMask_nx8888x0565Cmmx),
-	(fbCompositeSrcAdd_8000x8000mmx), (fbCompositeSrcAdd_8888x8888mmx),
-	(fbSolidFillmmx), (fbCopyAreammx), (fbCompositeCopyAreammx),
-	(detectCPUFeatures), (fbHaveMMX):
-	* src/fbmmx.h: Port MMX code from xserver to pixman.
-
-	* src/fbpict.c: (fbOver), (fbOver24), (fbIn), (fbIn24),
-	(fbCompositeSolidMask_nx8x8888),
-	(fbCompositeSolidMask_nx8888x8888C),
-	(fbCompositeSolidMask_nx8x0888), (fbCompositeSolidMask_nx8x0565),
-	(fbCompositeSolidMask_nx8888x0565),
-	(fbCompositeSolidMask_nx8888x0565C), (fbCompositeSrc_8888x8888),
-	(fbCompositeSrc_8888x0888), (fbCompositeSrc_8888x0565),
-	(fbCompositeSrcAdd_8000x8000), (fbCompositeSrcAdd_8888x8888),
-	(fbCompositeSrcAdd_1000x1000), (fbCompositeSolidMask_nx1xn),
-	(fbCompositeTrans_0565xnx0565), (fbCompositeTrans_0888xnx0888),
-	(fbCompositeSrcSrc_nxn), (pixman_composite): Add an fbpict.c ported
-	from the latest in xserver/fb, including hooks to the MMX code
-	where appropriate.  This replaces the old ic.c file.
-
-	* src/ic.c: Replaced by fbpict.c.
-
-	* src/icint.h: Move some X server macros from fbpict.c up into
-	icint.h to keep the diff small.
-
-	* src/Makefile.am: Add fbmmx and fbpict.c, remove ic.c.
-
-	* configure.in: Add a check for the MMX intrinsics.  gcc >= 3.4
-	is required.
-
-2005-08-12  Billy Biggs  <vektor at dumbterm.net>
-
-	* src/icrect.c: (pixman_fill_rect_1bpp): Fix to be correct for
-	arbitrary xDst values.
-
-2005-08-11  Billy Biggs  <vektor at dumbterm.net>
-
-	* src/icrect.c: (pixman_fill_rect_1bpp), (pixman_color_rects):
-	Add support for filling 1bpp images (used to clear A1 masks).
-
-2005-08-10  Billy Biggs  <vektor at dumbterm.net>
-
-	reviewed by: cworth and Jeff Muizelaar at various stages
-
-	* src/fbcompose.c: (PictureTransformPoint3d), (fbFetch_a8r8g8b8),
-	(fbFetch_x8r8g8b8), (fbFetch_a8b8g8r8), (fbFetch_x8b8g8r8),
-	(fbFetch_r8g8b8), (fbFetch_b8g8r8), (fbFetch_r5g6b5),
-	(fbFetch_b5g6r5), (fbFetch_a1r5g5b5), (fbFetch_x1r5g5b5),
-	(fbFetch_a1b5g5r5), (fbFetch_x1b5g5r5), (fbFetch_a4r4g4b4),
-	(fbFetch_x4r4g4b4), (fbFetch_a4b4g4r4), (fbFetch_x4b4g4r4),
-	(fbFetch_a8), (fbFetch_r3g3b2), (fbFetch_b2g3r3),
-	(fbFetch_a2r2g2b2), (fbFetch_a2b2g2r2), (fbFetch_c8), (fbFetch_a4),
-	(fbFetch_r1g2b1), (fbFetch_b1g2r1), (fbFetch_a1r1g1b1),
-	(fbFetch_a1b1g1r1), (fbFetch_c4), (fbFetch_a1), (fbFetch_g1),
-	(fetchProcForPicture), (fbFetchPixel_a8r8g8b8),
-	(fbFetchPixel_x8r8g8b8), (fbFetchPixel_a8b8g8r8),
-	(fbFetchPixel_x8b8g8r8), (fbFetchPixel_r8g8b8),
-	(fbFetchPixel_b8g8r8), (fbFetchPixel_r5g6b5),
-	(fbFetchPixel_b5g6r5), (fbFetchPixel_a1r5g5b5),
-	(fbFetchPixel_x1r5g5b5), (fbFetchPixel_a1b5g5r5),
-	(fbFetchPixel_x1b5g5r5), (fbFetchPixel_a4r4g4b4),
-	(fbFetchPixel_x4r4g4b4), (fbFetchPixel_a4b4g4r4),
-	(fbFetchPixel_x4b4g4r4), (fbFetchPixel_a8), (fbFetchPixel_r3g3b2),
-	(fbFetchPixel_b2g3r3), (fbFetchPixel_a2r2g2b2),
-	(fbFetchPixel_a2b2g2r2), (fbFetchPixel_c8), (fbFetchPixel_a4),
-	(fbFetchPixel_r1g2b1), (fbFetchPixel_b1g2r1),
-	(fbFetchPixel_a1r1g1b1), (fbFetchPixel_a1b1g1r1),
-	(fbFetchPixel_c4), (fbFetchPixel_a1), (fbFetchPixel_g1),
-	(fetchPixelProcForPicture), (fbStore_a8r8g8b8), (fbStore_x8r8g8b8),
-	(fbStore_a8b8g8r8), (fbStore_x8b8g8r8), (fbStore_r8g8b8),
-	(fbStore_b8g8r8), (fbStore_r5g6b5), (fbStore_b5g6r5),
-	(fbStore_a1r5g5b5), (fbStore_x1r5g5b5), (fbStore_a1b5g5r5),
-	(fbStore_x1b5g5r5), (fbStore_a4r4g4b4), (fbStore_x4r4g4b4),
-	(fbStore_a4b4g4r4), (fbStore_x4b4g4r4), (fbStore_a8),
-	(fbStore_r3g3b2), (fbStore_b2g3r3), (fbStore_a2r2g2b2),
-	(fbStore_c8), (fbStore_a4), (fbStore_r1g2b1), (fbStore_b1g2r1),
-	(fbStore_a1r1g1b1), (fbStore_a1b1g1r1), (fbStore_c4), (fbStore_a1),
-	(fbStore_g1), (storeProcForPicture), (fbCombineMaskU),
-	(fbCombineClear), (fbCombineSrcU), (fbCombineOverU),
-	(fbCombineOverReverseU), (fbCombineInU), (fbCombineInReverseU),
-	(fbCombineOutU), (fbCombineOutReverseU), (fbCombineAtopU),
-	(fbCombineAtopReverseU), (fbCombineXorU), (fbCombineAddU),
-	(fbCombineSaturateU), (fbCombineDisjointOutPart),
-	(fbCombineDisjointInPart), (fbCombineDisjointGeneralU),
-	(fbCombineDisjointOverU), (fbCombineDisjointInU),
-	(fbCombineDisjointInReverseU), (fbCombineDisjointOutU),
-	(fbCombineDisjointOutReverseU), (fbCombineDisjointAtopU),
-	(fbCombineDisjointAtopReverseU), (fbCombineDisjointXorU),
-	(fbCombineConjointOutPart), (fbCombineConjointInPart),
-	(fbCombineConjointGeneralU), (fbCombineConjointOverU),
-	(fbCombineConjointOverReverseU), (fbCombineConjointInU),
-	(fbCombineConjointInReverseU), (fbCombineConjointOutU),
-	(fbCombineConjointOutReverseU), (fbCombineConjointAtopU),
-	(fbCombineConjointAtopReverseU), (fbCombineConjointXorU),
-	(fbCombineMaskC), (fbCombineMaskValueC), (fbCombineMaskAlphaC),
-	(fbCombineClearC), (fbCombineSrcC), (fbCombineOverC),
-	(fbCombineOverReverseC), (fbCombineInC), (fbCombineInReverseC),
-	(fbCombineOutC), (fbCombineOutReverseC), (fbCombineAtopC),
-	(fbCombineAtopReverseC), (fbCombineXorC), (fbCombineAddC),
-	(fbCombineSaturateC), (fbCombineDisjointGeneralC),
-	(fbCombineDisjointOverC), (fbCombineDisjointInC),
-	(fbCombineDisjointInReverseC), (fbCombineDisjointOutC),
-	(fbCombineDisjointOutReverseC), (fbCombineDisjointAtopC),
-	(fbCombineDisjointAtopReverseC), (fbCombineDisjointXorC),
-	(fbCombineConjointGeneralC), (fbCombineConjointOverC),
-	(fbCombineConjointOverReverseC), (fbCombineConjointInC),
-	(fbCombineConjointInReverseC), (fbCombineConjointOutC),
-	(fbCombineConjointOutReverseC), (fbCombineConjointAtopC),
-	(fbCombineConjointAtopReverseC), (fbCombineConjointXorC),
-	(fbFetchSolid), (fbFetch), (gradientPixel), (fbFetchSourcePict),
-	(fbFetchTransformed), (fbFetchExternalAlpha), (fbStore),
-	(fbStoreExternalAlpha), (fbCompositeRect),
-	(pixman_compositeGeneral): Port fbcompose.c from xserver into
-	pixman.  Add #defines for gradients, convolution filters, and
-	indexed colour formats to keep the patch small.  Use pixman
-	regions instead of X server regions as appropriate.
-
-	* src/iccompose.c: Remove iccompose.c, replaced by fbcompose.c.
-
-	* src/fbpict.h: Add a slightly-trimmed version of fbpict.h from
-	xserver/fb to make the port smaller and cleaner.
-	* src/ic.c: Use the redundant fbpict.h defines and add in the
-	struct for indexed colour support.
-	* src/icimage.h: Remove defines now in fbpict.h.
-	* src/pixman-xserver-compat.h: Add some constants and types
-	required by fbcompose.c
-
-	* src/Makefile.am: Add fbcompose.c and fbpict.h, remove iccompose.c.
-
-2005-08-10  Keith Packard  <keithp at keithp.com>
-
-	* src/pixregion.c: (pixman_region_union_rect):
-	Union with empty rectangle should yield SUCCESS, not FAILURE
-
-2005-08-06  Jeff Muizelaar  <jeff at infidigm.net>
-
-	* src/iccompose.c: (fbCombineMaskAlphaC), (fbCombineAtopC),
-	(fbCombineXorC), (fbCombineSaturateU), (fbCombineSaturateC),
-	(fbCombineDisjointGeneralC), (fbCombineConjointGeneralC):
-	Fix problems in render fb implementation found by rendercheck:
-	- fbCombineSaturate was pointed at fbCombineDisjointOver, instead of
-	  fbCombineDisjointOverReverse as it should.  Instead, point
-	  fbCombineDisjointOverReverse at fbCombineSaturate (which is likely
-	  to be faster).
-	- fix previously-unused fbCombineSaturate implementation.
-	- fbCombineMaskAlphaC was just a copy of fbCombineMaskValueC.  Make
-	  it do what it's supposed to (return a cs.alpha).
-	- fbCombineAtopC didn't invert the source alpha value.
-	- fix copy'n'paste errors in fbCombine(Dis/Con)jointGeneralC, also
-	  source alpha wasn't treated in a component fashion.
-
-	From anholt.
-
-
-2005-08-06  Jeff Muizelaar  <jeff at infidigm.net>
-
-	* src/iccompose.c: (fbFetch_r8g8b8):
-	Temporarily disable the 24bpp WORKING_UNALIGNED_INT because of a crash
-	when using electric-fence when accessing hte last pixel of a drawable
-	(last pixel is 3 bytes, read it as a 4 byte word, and you're reading one
-	 extra pixel, which doesn't normally matter, but does in a few rare cases).
-	Should be easy to work around, but that will come later.
-
-	From jaymz
-
-2005-08-05  Jeff Muizelaar  <jeff at infidigm.net>
-
-	* src/pixman-xserver-compat.h: Fix fbGetDrawable
-
-	Patch from Billy Biggs <vektor at dumbterm.net>.
-
-2005-08-05  Jeff Muizelaar  <jeff at infidigm.net>
-
-	* src/icint.h: Fix some of the 4 bit per channel PICT definitions
-
-	Patch from Billy Biggs <vektor at dumbterm.net>.
-
-2005-08-05  Jeff Muizelaar  <jeff at infidigm.net>
-
-	* src/ic.c: (fbCompositeSolidMask_nx8x8888),
-	(fbCompositeSolidMask_nx8x0888), (fbCompositeSolidMask_nx8x0565),
-	(fbCompositeSolidMask_nx8888x0565),
-	(fbCompositeSolidMask_nx8888x0565C), (fbCompositeSrc_8888x0565),
-	(fbCompositeTrans_0565xnx0565), (fbCompositeTrans_0888xnx0888),
-	(fbCompositeSrcSrc_nxn), (pixman_composite):
-	Fix up the fast-path compositing operators; those are useful
-	for sources without alpha, but can't be used for sources with
-	alpha.  Also, replaced fbCompositeSrcSrc_nxn with call to
-	fbBlt as this function must handle 1, 4, 8, 16, 24, 32 bpp
-	objects.  Would be nice to optimize fbBlt for common cases
-	involving 8, 16, 24 and 32bpp.
-
-	From Keith Packard.
-
-2005-08-01  Billy Biggs  <vektor at dumbterm.net>
-
-	* src/fbedge.c: (clip255), (add_saturate_8),
-	(fbRasterizeEdges8):  Optimize spans where the same value is
-	being added to multiple pixels.  This improves the speed of
-	rasterizing wide trapezoids.
-
-	* src/icint.h: Add an INLINE macro that matches the one from
-	fbpict.h in xserver/fb.
-
-2005-08-01  Amaury Jacquot  <sxpert at esitcom.org>
-	
-	* NEWS: fix typo
-
-2005-07-30  Jeff Muizelaar  <jeff at infidigm.net>
-
-	* src/ic.c: (fbCompositeSolidMask_nx8x0888),
-	(fbCompositeSolidMask_nx8x0565), (fbCompositeSolidMask_nx1xn),
-	(fbCompositeTrans_0565xnx0565), (fbCompositeTrans_0888xnx0888),
-	(fbCompositeSrcSrc_nxn), (pixman_composite):
-	* src/icblt.c: (fbBlt):
-	* src/iccompose.c: (fbFetch_r8g8b8):
-	Finish up merging the optimization work from jaymz.
-
-2005-07-30  Jeff Muizelaar  <jeff at infidigm.net>
-
-	* src/iccompose.c: (fbCombineMaskAlphaU),
-	(fbCombineDisjointOutPart), (fbCombineDisjointInPart),
-	(fbCombineConjointOutPart), (fbCombineConjointInPart),
-	(fbStore_a8r8g8b8), (fbStore_x8r8g8b8), (fbStore_a8b8g8r8),
-	(fbStore_x8b8g8r8), (fbStore_r8g8b8), (fbStore_b8g8r8),
-	(fbStore_r5g6b5), (fbStore_b5g6r5), (fbStore_a1r5g5b5),
-	(fbStore_x1r5g5b5), (fbStore_a1b5g5r5), (fbStore_x1b5g5r5),
-	(fbStore_a4r4g4b4), (fbStore_x4r4g4b4), (fbStore_a4b4g4r4),
-	(fbStore_x4b4g4r4), (fbStore_a8), (fbStore_r3g3b2),
-	(fbStore_b2g3r3), (fbStore_a2r2g2b2), (fbStore_a4),
-	(fbStore_r1g2b1), (fbStore_b1g2r1), (fbStore_a1r1g1b1),
-	(fbStore_a1b1g1r1), (fbStore_a1), (fbFetch_external),
-	(fbStore_external), (fbFetch_transform), (fbFetcha_transform):
-	s/uint(8|16|32)_t/CARD(8|16|32)/
-
-2005-07-30  Jeff Muizelaar  <jeff at infidigm.net>
-
-	* src/ic.c: (fbCompositeSolidMask_nx8x0888),
-	(fbCompositeSolidMask_nx8x0565), (fbCompositeTrans_0565xnx0565),
-	(fbCompositeTrans_0888xnx0888), (fbCompositeSrcSrc_nxn),
-	(pixman_composite):
-	Add some optimizations from jaymz. Also adds some compile warnings
-	that will hopefully go away as we continue merging.
-
-2005-07-28  Carl Worth  <cworth at cworth.org>
-
-	* configure.in: Add -head to LIBPIXMAN_VERSION after tagging with
-	SNAPSHOT_0_1_6.
-
-2005-07-28  Carl Worth  <cworth at cworth.org>
-
-	* NEWS: Add notes for snapshot 0.1.6.
-	
-	* configure.in: Increment version to 0.1.6.
-
-2005-07-27  Owen Taylor  <otaylor at redhat.com>
-
-	* src/icint.h (FbGetStipPixels): Fix units for stride return
-	to be FbStip-sized.
-
-2005-07-16  Jeff Muizelaar  <jeff at infidigm.net>
-
-	* src/ic.c: (pixman_composite):
-	Add call to fbCompositeSrcSrc_nxn that I missed.
-
-2005-07-14  Carl Worth  <cworth at cworth.org>
-
-	* src/icimage.c: (pixman_image_set_component_alpha): Whitespace fix.
-	(pixman_image_destroy): Fix leak of the clip region associated
-	with an image. (NOTE: xserver/render doesn't have the same bug
-	since it has FreePicture that calls into both DestroyPicture and
-	DestroyPictureClip separately).
-
-2005-07-09  Jeff Muizelaar  <jeff at infidigm.net>
-
-	* src/ic.c: (fbIn24), (fbCompositeTrans_0565xnx0565),
-	(fbCompositeSrcSrc_nxn), (pixman_composite):
-	Begin merging in newer fb code.
-	
-	The code comes from keithp:
-	  Initial import of Composite extension along with
-	  name change from Apportion.
-	  Added some accelerated code to fbpict to make this initial
-	  hack a bit faster.  "real" extension bits to follow.
-
-2005-07-09  Jeff Muizelaar  <jeff at infidigm.net>
-
-	* src/ic.c: (fbCompositeSolidMask_nx8x8888),
-	(fbCompositeSolidMask_nx8888x8888C),
-	(fbCompositeSolidMask_nx8x0888), (fbCompositeSolidMask_nx8x0565),
-	(fbCompositeSolidMask_nx8888x0565C), (fbCompositeSrc_8888x8888),
-	(fbCompositeSrc_8888x0888), (fbCompositeSrc_8888x0565),
-	(fbCompositeSrc_0565x0565), (fbCompositeSrcAdd_8000x8000),
-	(fbCompositeSrcAdd_8888x8888), (fbCompositeSrcAdd_1000x1000),
-	(fbCompositeSolidMask_nx1xn), (pixman_composite):
-	More misc merging. Mostly s/pixman_composite/fbComposite/.
-
-2005-07-09  Jeff Muizelaar  <jeff at infidigm.net>
-
-	* src/ic.c: (fbOver), (fbOver24), (fbIn),
-	(pixman_compositeSolidMask_nx8x8888),
-	(pixman_compositeSolidMask_nx8888x8888C),
-	(pixman_compositeSolidMask_nx8x0888),
-	(pixman_compositeSolidMask_nx8x0565),
-	(pixman_compositeSolidMask_nx8888x0565C),
-	(pixman_compositeSrc_8888x8888), (pixman_compositeSrc_8888x0888),
-	(pixman_compositeSrc_8888x0565), (pixman_compositeSrc_0565x0565),
-	(pixman_compositeSrcAdd_8000x8000),
-	(pixman_compositeSrcAdd_8888x8888),
-	(pixman_compositeSrcAdd_1000x1000),
-	(pixman_compositeSolidMask_nx1xn), (pixman_composite):
-	More misc merging. Mostly stuff like s/uint32_t/CARD32/.
-
-2005-06-25  Jeff Muizelaar  <jeff at infidigm.net>
-
-	* src/ic.c: (fbOver):
-	* src/icblt.c: (fbBlt), (fbBlt24Line), (fbBlt24), (fbBltOdd),
-	(fbBltOdd24), (fbBltStip):
-	* src/icbltone.c: (fbBltOne):
-	* src/iccompose.c: (fbCombineMaskU), (fbCombineMaskC),
-	(fbCombineMaskValueC), (fbCombineMaskAlphaC), (fbCombineOverU),
-	(fbCombineOverC), (fbCombineOverReverseU), (fbCombineOverReverseC),
-	(fbCombineInU), (fbCombineInC), (fbCombineInReverseU),
-	(fbCombineInReverseC), (fbCombineOutU), (fbCombineOutC),
-	(fbCombineOutReverseU), (fbCombineOutReverseC), (fbCombineAtopU),
-	(fbCombineAtopC), (fbCombineAtopReverseU), (fbCombineAtopReverseC),
-	(fbCombineXorU), (fbCombineXorC), (fbCombineAddU), (fbCombineAddC),
-	(fbCombineDisjointGeneralU), (fbCombineDisjointGeneralC),
-	(fbCombineDisjointOverU), (fbCombineConjointGeneralU),
-	(fbCombineConjointGeneralC), (fbCombineConjointOverU),
-	(fbFetch_a8r8g8b8), (fbFetch_x8r8g8b8), (fbFetch_a8b8g8r8),
-	(fbFetch_x8b8g8r8), (fbFetch_r8g8b8), (fbFetch_b8g8r8),
-	(fbFetch_r5g6b5), (fbFetch_b5g6r5), (fbFetch_a1r5g5b5),
-	(fbFetch_x1r5g5b5), (fbFetch_a1b5g5r5), (fbFetch_x1b5g5r5),
-	(fbFetch_a4r4g4b4), (fbFetch_x4r4g4b4), (fbFetch_a4b4g4r4),
-	(fbFetch_x4b4g4r4), (fbFetch_a8), (fbFetcha_a8), (fbFetch_r3g3b2),
-	(fbFetch_b2g3r3), (fbFetch_a2r2g2b2), (fbFetch_a4), (fbFetcha_a4),
-	(fbFetch_r1g2b1), (fbFetch_b1g2r1), (fbFetch_a1r1g1b1),
-	(fbFetch_a1b1g1r1), (fbFetcha_a1), (fbFetch_a1),
-	(fbBuildCompositeOperand), (pixman_compositeGeneral):
-	* src/icint.h:
-	* src/icrop.h:
-	* src/icutil.c:
-	* src/pixman-xserver-compat.h:
-
-	Merge over most of the low-hanging renames from xserver/fb.
-
-2005-06-25  Jeff Muizelaar  <jeff at infidigm.net>
-
-	* src/icint.h:
-	Fix broken build on older gcc's caused by overzealous s/IC_/FB_/g
-
-2005-06-24  Jeff Muizelaar  <jeff at infidigm.net>
-
-	* src/ic.c:
-	* src/icblt.c:
-	* src/icbltone.c:
-	* src/iccolor.c:
-	* src/iccompose.c:
-	* src/icformat.c:
-	* src/icimage.c:
-	* src/icimage.h:
-	* src/icint.h:
-	* src/icpixels.c:
-	* src/icrect.c:
-	* src/icrop.h:
-	* src/icstipple.c:
-	* src/ictrap.c:
-	* src/ictri.c:
-	* src/icutil.c:
-	* src/pixman-xserver-compat.h:
-
-	s/Ic/Fb/g
-	This gets read of most of the [Ii][cC]'s the rest will probably dealt
-	with on a case by case basis.
-	
-	trimmed function list again.
-
-2005-06-24  Jeff Muizelaar <jeff at infidigm.net>
-
-	* src/ic.c:
-	* src/icblt.c:
-	* src/icbltone.c:
-	* src/iccompose.c:
-	* src/icimage.h:
-	* src/icint.h:
-	* src/icrop.h:
-	* src/icstipple.c:
-	* src/icutil.c:
-	
-	selective s/Ic/fb/g.
-
-	I took out the list of functions because it was ridiculously long.
-
-2005-06-24  Jeff Muizelaar  <jeff at infidigm.net>
-
-	* src/ic.c: (pixman_compositeSrcAdd_1000x1000),
-	(pixman_compositeSolidMask_nx1xn):
-	* src/icblt.c: (IcBlt), (IcBlt24Line), (IcBltOdd), (IcSetBltOdd),
-	(IcBltStip):
-	* src/icbltone.c: (IcBltOne), (IcBltOne24):
-	* src/icint.h:
-	* src/icpixels.c: (IcPixelsCreate):
-	* src/icrop.h:
-	* src/icstipple.c: (IcTransparentSpan):
-	* src/icutil.c: (IcReplicatePixel):
-	* src/pixman-xserver-compat.h:
-	s/IC_/FB_/g
-	
-	* src/pixman.h:
-	add #define FB_BITS IC_BITS so that FB_BITS get defined early enough
-
-2005-06-23  Jeff Muizelaar  <jeff at infidigm.net>
-
-	* src/iccompose.c: (fbCombineClear), (fbCombineSrcU),
-	(fbCombineSrcC), (fbCombineDst), (fbCombineOverU),
-	(fbCombineOverC), (fbCombineOverReverseU), (fbCombineOverReverseC),
-	(fbCombineInU), (fbCombineInC), (fbCombineInReverseU),
-	(fbCombineInReverseC), (fbCombineOutU), (fbCombineOutC),
-	(fbCombineOutReverseU), (fbCombineOutReverseC), (fbCombineAtopU),
-	(fbCombineAtopC), (fbCombineAtopReverseU), (fbCombineAtopReverseC),
-	(fbCombineXorU), (fbCombineXorC), (fbCombineAddU), (fbCombineAddC),
-	(fbCombineDisjointOverU), (fbCombineDisjointOverC),
-	(fbCombineDisjointOverReverseU), (fbCombineDisjointOverReverseC),
-	(fbCombineDisjointInU), (fbCombineDisjointInC),
-	(fbCombineDisjointInReverseU), (fbCombineDisjointInReverseC),
-	(fbCombineDisjointOutU), (fbCombineDisjointOutC),
-	(fbCombineDisjointOutReverseU), (fbCombineDisjointOutReverseC),
-	(fbCombineDisjointAtopU), (fbCombineDisjointAtopC),
-	(fbCombineDisjointAtopReverseU), (fbCombineDisjointAtopReverseC),
-	(fbCombineDisjointXorU), (fbCombineDisjointXorC),
-	(fbCombineConjointOverU), (fbCombineConjointOverC),
-	(fbCombineConjointOverReverseU), (fbCombineConjointOverReverseC),
-	(fbCombineConjointInU), (fbCombineConjointInC),
-	(fbCombineConjointInReverseU), (fbCombineConjointInReverseC),
-	(fbCombineConjointOutU), (fbCombineConjointOutC),
-	(fbCombineConjointOutReverseU), (fbCombineConjointOutReverseC),
-	(fbCombineConjointAtopU), (fbCombineConjointAtopC),
-	(fbCombineConjointAtopReverseU), (fbCombineConjointAtopReverseC),
-	(fbCombineConjointXorU), (fbCombineConjointXorC):
-
-	s/IcCombine/fbCombine/
-
-2005-06-23  Jeff Muizelaar  <jeff at infidigm.net>
-
-	* src/iccompose.c: (IcCombineMaskU), (IcCombineMaskC),
-	(IcCombineMaskValueC), (IcCombineMaskAlphaU),
-	(IcCombineMaskAlphaC), (IcCombineClear), (IcCombineSrcU),
-	(IcCombineSrcC), (IcCombineDst), (IcCombineOverU),
-	(IcCombineOverC), (IcCombineOverReverseU), (IcCombineOverReverseC),
-	(IcCombineInU), (IcCombineInC), (IcCombineInReverseU),
-	(IcCombineInReverseC), (IcCombineOutU), (IcCombineOutC),
-	(IcCombineOutReverseU), (IcCombineOutReverseC), (IcCombineAtopU),
-	(IcCombineAtopC), (IcCombineAtopReverseU), (IcCombineAtopReverseC),
-	(IcCombineXorU), (IcCombineXorC), (IcCombineAddU), (IcCombineAddC),
-	(IcCombineDisjointGeneralU), (IcCombineDisjointGeneralC),
-	(IcCombineDisjointOverU), (IcCombineDisjointOverC),
-	(IcCombineDisjointOverReverseU), (IcCombineDisjointOverReverseC),
-	(IcCombineDisjointInU), (IcCombineDisjointInC),
-	(IcCombineDisjointInReverseU), (IcCombineDisjointInReverseC),
-	(IcCombineDisjointOutU), (IcCombineDisjointOutC),
-	(IcCombineDisjointOutReverseU), (IcCombineDisjointOutReverseC),
-	(IcCombineDisjointAtopU), (IcCombineDisjointAtopC),
-	(IcCombineDisjointAtopReverseU), (IcCombineDisjointAtopReverseC),
-	(IcCombineDisjointXorU), (IcCombineDisjointXorC),
-	(IcCombineConjointGeneralU), (IcCombineConjointGeneralC),
-	(IcCombineConjointOverU), (IcCombineConjointOverC),
-	(IcCombineConjointOverReverseU), (IcCombineConjointOverReverseC),
-	(IcCombineConjointInU), (IcCombineConjointInC),
-	(IcCombineConjointInReverseU), (IcCombineConjointInReverseC),
-	(IcCombineConjointOutU), (IcCombineConjointOutC),
-	(IcCombineConjointOutReverseU), (IcCombineConjointOutReverseC),
-	(IcCombineConjointAtopU), (IcCombineConjointAtopC),
-	(IcCombineConjointAtopReverseU), (IcCombineConjointAtopReverseC),
-	(IcCombineConjointXorU), (IcCombineConjointXorC),
-	(IcFetch_a8r8g8b8), (IcFetch_x8r8g8b8), (IcFetch_a8b8g8r8),
-	(IcFetch_x8b8g8r8), (IcFetch_r8g8b8), (IcFetch_b8g8r8),
-	(IcFetch_r5g6b5), (IcFetch_b5g6r5), (IcFetch_a1r5g5b5),
-	(IcFetch_x1r5g5b5), (IcFetch_a1b5g5r5), (IcFetch_x1b5g5r5),
-	(IcFetch_a4r4g4b4), (IcFetch_x4r4g4b4), (IcFetch_a4b4g4r4),
-	(IcFetch_x4b4g4r4), (IcFetch_a8), (IcFetcha_a8), (IcFetch_r3g3b2),
-	(IcFetch_b2g3r3), (IcFetch_a2r2g2b2), (IcFetch_a4), (IcFetcha_a4),
-	(IcFetch_r1g2b1), (IcFetch_b1g2r1), (IcFetch_a1r1g1b1),
-	(IcFetch_a1b1g1r1), (IcFetcha_a1), (IcFetch_a1),
-	(IcStore_a8r8g8b8), (IcStore_x8r8g8b8), (IcStore_a8b8g8r8),
-	(IcStore_x8b8g8r8), (IcStore_r8g8b8), (IcStore_b8g8r8),
-	(IcStore_r5g6b5), (IcStore_b5g6r5), (IcStore_a1r5g5b5),
-	(IcStore_x1r5g5b5), (IcStore_a1b5g5r5), (IcStore_x1b5g5r5),
-	(IcStore_a4r4g4b4), (IcStore_x4r4g4b4), (IcStore_a4b4g4r4),
-	(IcStore_x4b4g4r4), (IcStore_a8), (IcStore_r3g3b2),
-	(IcStore_b2g3r3), (IcStore_a2r2g2b2), (IcStore_a4),
-	(IcStore_r1g2b1), (IcStore_b1g2r1), (IcStore_a1r1g1b1),
-	(IcStore_a1b1g1r1), (IcStore_a1), (IcFetch_external),
-	(IcFetcha_external), (IcStore_external), (IcFetch_transform),
-	(IcFetcha_transform), (IcStepOver), (IcStepDown), (IcSet),
-	(IcStepOver_external), (IcStepDown_external), (IcSet_external),
-	(IcStepOver_transform), (IcStepDown_transform), (IcSet_transform),
-	(IcBuildCompositeOperand), (pixman_compositeGeneral):
-	* src/icimage.h:
-
-	s/pixman_compositeOperand/FbCompositeOperand/g.
-
-2005-06-23  Jeff Muizelaar  <jeff at infidigm.net>
-
-	* src/ic.c: (pixman_compositeSrcAdd_1000x1000),
-	(pixman_compositeSolidMask_nx1xn):
-	* src/icblt.c: (IcBlt), (IcBlt24Line), (IcBlt24), (IcBltOdd),
-	(IcBltOdd24), (IcSetBltOdd), (IcBltStip):
-	* src/icbltone.c: (IcBltOne), (IcBltOne24):
-	* src/iccompose.c: (IcFetch_a8r8g8b8), (IcFetch_x8r8g8b8),
-	(IcFetch_a8b8g8r8), (IcFetch_x8b8g8r8), (IcFetch_r8g8b8),
-	(IcFetch_b8g8r8), (IcFetch_r5g6b5), (IcFetch_b5g6r5),
-	(IcFetch_a1r5g5b5), (IcFetch_x1r5g5b5), (IcFetch_a1b5g5r5),
-	(IcFetch_x1b5g5r5), (IcFetch_a4r4g4b4), (IcFetch_x4r4g4b4),
-	(IcFetch_a4b4g4r4), (IcFetch_x4b4g4r4), (IcFetch_a8),
-	(IcFetcha_a8), (IcFetch_r3g3b2), (IcFetch_b2g3r3),
-	(IcFetch_a2r2g2b2), (IcFetch_a4), (IcFetcha_a4), (IcFetch_r1g2b1),
-	(IcFetch_b1g2r1), (IcFetch_a1r1g1b1), (IcFetch_a1b1g1r1),
-	(IcFetcha_a1), (IcFetch_a1), (IcStore_a8r8g8b8),
-	(IcStore_x8r8g8b8), (IcStore_a8b8g8r8), (IcStore_x8b8g8r8),
-	(IcStore_r8g8b8), (IcStore_b8g8r8), (IcStore_r5g6b5),
-	(IcStore_b5g6r5), (IcStore_a1r5g5b5), (IcStore_x1r5g5b5),
-	(IcStore_a1b5g5r5), (IcStore_x1b5g5r5), (IcStore_a4r4g4b4),
-	(IcStore_x4r4g4b4), (IcStore_a4b4g4r4), (IcStore_x4b4g4r4),
-	(IcStore_a8), (IcStore_r3g3b2), (IcStore_b2g3r3),
-	(IcStore_a2r2g2b2), (IcStore_a4), (IcStore_r1g2b1),
-	(IcStore_b1g2r1), (IcStore_a1r1g1b1), (IcStore_a1b1g1r1),
-	(IcStore_a1), (IcBuildCompositeOperand):
-	* src/icimage.c: (pixman_image_create_for_data):
-	* src/icstipple.c: (IcTransparentSpan):
-
-	s/pixman_bits_t/FbBits/s
-
-2005-06-23  Jeff Muizelaar  <jeff at infidigm.net>
-
-	* src/ic.c: (pixman_compositeSrcAdd_8000x8000),
-	(pixman_compositeSrcAdd_8888x8888):
-	more merging:
-
-	630. Fix incorrect datatype for the pixmap width in
-	fbCompositeSrcAdd_8000x8000(), and add some small optimisations
-	(#A.1423, Keith Packard).
-
-2005-06-23  Jeff Muizelaar  <jeff at infidigm.net>
-
-	* src/icint.h:
-	* src/icblt.c: (IcBlt):
-	Start the xserver/fb -> libpixman merging with a copy
-	optimization.
-
-2005-05-26  Keith Packard  <keithp at keithp.com>
-
-	* src/iccompose.c: (IcFetch_transform), (IcFetcha_transform),
-	(IcBuildCompositeOperand):
-	* src/icimage.c: (pixman_image_init), (pixman_image_destroy),
-	(pixman_image_set_clip_region), (IcClipImageSrc):
-	* src/icimage.h:
-
-	Split clipping into separate source and destination operand
-	clips.  By default, source operands are not affected by
-	any client clipping.  This matches the desired semantics
-	for cairo.  When this code is ported back to the X server,
-	that will have to select the clipping option which clip
-	source operands to the client clip.
-
-2005-05-18  Carl Worth  <cworth at cworth.org>
-
-	* configure.in: Add -head to CAIRO_VERSION after tagging with
-	SNAPSHOT_0_1_5.
-
-2005-05-18  Carl Worth  <cworth at cworth.org>
-
-	* NEWS: Add notes for snapshot 0.1.5.
-
-	* configure.in: Increment version to 0.1.5.
-
-2005-05-18  Carl Worth  <cworth at cworth.org>
-
-	* src/icimage.c (pixman_image_destroy): Clear pointers to NULL
-	after destroying/freeing them.
-
-2005-05-18  Carl Worth  <cworth at cworth.org>
-	
-	* src/pixman.h: Declare pixman_fixed16_16_t properly as int32_t
-	rather than just int. Reported by Lance Fetters.
-
-2005-05-12  Keith Packard  <keithp at keithp.com>
-
-	reviewed by: cworth
-
-	* src/ictrap.c: (pixman_composite_trapezoids):
-	libpixman creates an A8 format object and sometimes forgets to
-	destroy (when the bounds of the trapezoids are empty).
-	Avoids creating the format object in that case.
-
-2005-04-27  Owen Taylor  <otaylor at redhat.com>
-
-	* src/icimage.c (pixman_image_set_clip_region): Set
-	image->pCompositeClip here.
-	(IcComputeCompositeRegion) src/icrect.c (pixman_color_rects):
-	Remove workaround clipping to the clientClip.
-
-2005-04-27  Owen Taylor  <otaylor at redhat.com>
-
-	* src/ic.c: Don't use pixman_compositeSrc_8888x8888 when
-	the source is x8r8g8b8 or x8b8g8r8.
-
-2005-03-29  T Rowley  <tim.rowley at gmail.com>
-
-	* src/pixman.h: add AIX to the test for inttypes.h
-
-2005-03-11  Owen Taylor  <otaylor at redhat.com>
-
-	* src/icformat.c (pixman_format_init): Set format->depth
-	correctly instead of just using the bpp.
-
-2005-03-07  Carl Worth  <cworth at cworth.org>
-
-	* configure.in: Increment version to 0.1.4-head post-snapshot.
-
-	* RELEASING: Add notes on using -head suffix for PIXMAN_VERSION.
-
-	* NEWS: Add notes for snapshot 0.1.4.
-
-	* configure.in: Increment version to 0.1.4.
-
-2005-03-04  Carl Worth  <cworth at cworth.org>
-
-	* src/ictrap.c (pixman_composite_trapezoids): Intersect bounds of
-	trapezoids with the bounds of the destination surface before
-	creating an intermediate surface.
-
-2005-03-04  Carl Worth  <cworth at cworth.org>
-
-	* src/ictrap.c (pixman_composite_trapezoids): Add comment from
-	xserver's mitrap.c.
-
-2005-03-04  David Reveman  <davidr at novell.com>
-
-	* src/pixman.h: 
-	* src/ictrap.c: Add pixman_add_trapezoids.
-
-2005-03-03  Carl Worth  <cworth at cworth.org>
-
-	* src/icimage.c (miIsSolidAlpha): Port from render/mipict.c.
-
-	* src/ictrap.c (pixman_composite_trapezoids): Merge in
-	optimization from render/mitrap.c for op==ADD and solid alpha src.
-
-2005-03-03  Carl Worth  <cworth at cworth.org>
-
-	* src/pixman-xserver-compat.h (BoxRec, BoxPtr, Bool, TRUE, FALSE):
-	Add a few more things that might be helpful when moving more files
-	over from xserver.
-
-2005-03-03  Carl Worth  <cworth at cworth.org>
-
-	* src/icint.h:
-	* src/ictrap.c: Move definitions of MIN and MAX macros from
-	ictrap.c to icint.h.
-
-2005-03-03  Carl Worth  <cworth at cworth.org>
-
-	* src/ictrap.c (pixman_composite_trapezoids): Remove dead "if
-	(!format)" code which also makes things more in synch with the
-	server's mitrap.c.
-
-2005-03-03  Carl Worth  <cworth at cworth.org>
-
-	* src/ictrap.c: Restore original copyright and license which must
-	have been inadvertently changed.
-
-2005-03-02  Carl Worth  <cworth at cworth.org>
-
-	* src/pixman-xserver-compat.h: Fix comment to clarify that
-	libpixman regards the xserver repository as its canonical upstream
-	for some files.
-
-	* src/ic.c, src/icblt.c, src/icbltone.c, src/iccolor.c,
-	src/iccompose.c, src/icformat.c, src/icimage.c, src/icimage.h,
-	src/icint.h, src/icpixels.c, src/icrect.c, src/icrop.h,
-	src/icstipple.c, src/ictransform.c, src/ictrap.c, src/ictri.c,
-	src/icutil.c, src/pixman.h, src/slim_internal.h: Convert file
-	encodings from ISO-8859 to UTF-8.
-
-2005-02-21  Carl Worth  <cworth at cworth.org>
-
-	* src/renderedge.h: Add only-just-better-than-ASCII-art diagram
-	showing all macros used in locating sub-pixel sample rows/columns.
-	
-	* src/renderedge.h (RenderEdgeStepSmall, RenderEdgeStepBig): Add
-	missing protective parentheses around macro parameter usage.
-
-2005-02-21  Carl Worth  <cworth at cworth.org>
-
-	* src/ic.c: 
-	* src/icint.h: Move definition of __inline for non-gcc from ic.c
-	to icint.h so it applies to more code in the implementation.
-
-2005-02-06  Owen Taylor  <otaylor at redhat.com>
-
-	* configure.in: Add AC_PREREQ(2.54) to help the Debian 
-	auto-guess-which-configure-version hack.
-
-2005-01-26  Carl Worth  <cworth at cworth.org>
-
-	* src/pixman.h: Use 32-bits for pixman_bits_t, even on 64-bit
-	platforms. This should fix bug #2335 as well as rendering problems
-	seen on 64-bit platforms.
-
-2005-01-21  Carl Worth  <cworth at cworth.org>
-
-	* NEWS: Add notes for snapshot 0.1.3.
-
-	* configure.in: Increment version to 0.1.3
-
-	* RELEASING: Add reminder to diff pixman.h to look for API changes
-	since the last snapshot.
-
-	* src/Makefile.am (libpixman_la_SOURCES): Add missing files to
-	satisfy make distcheck.
-
-	* Makefile.am (RELEASE_UPLOAD_DIR): Update for changed www
-	directory on server.
-
-	* src/pixman-xserver-compat.h): Add pixman-xserver-compat.h, (that
-	was supposed to go in a couple of commits ago).
-
-	* src/fbedgeimp.h (rasterizeEdges): Avoid buffer ovverrun when
-	trapezoid's right edge is on a pixel boundary.
-
-	* src/ictri.c (IcRasterizeTriangle): 
-	* src/ictrap.c (pixman_composite_trapezoids): Switch to use new
-	fbRasterizeTrapezoid. Gut old IcRasterizeTrapezoid
-	implementation. Remove lots of code, (and all the bugs with it).
-
-	* src/icint.h: Replace IcRasterizeTrapezoid with
-	fbRasterizeTrapezoid. Add a couple of missing typedefs.
-
-	* src/renderedge.h: 
-	* src/renderedge.c (RenderLineFixedEdgeInit): 
-	* src/fbtrap.c: 
-
-	* src/fbedge.c: Minor changes to allow things to compile within
-	libpixman tree, (replace xserver include directives with
-	pixman-xserver-compat.h and sprinkle a few const qualifiers).
-
-	* src/Makefile.am (libpixman_la_SOURCES): Add sources for new
-	point-sampling rasterization.
-
-	* src/fbtrap.c: Merge in changes from xserver, (mostly just
-	whitespace).
-
-2005-01-18  Carl Worth  <cworth at cworth.org>
-
-	* src/fbedge.c:
-	* src/fbedgeimp.h:
-	* src/fbtrap.c:
-	* src/renderedge.c:
-	* src/renderedge.h: Add pristine files from the X server
-	containing Keith's newer point-sampling implementation of
-	trapezoid rasterization. The plan is to munge these files as
-	little as possible to make them work within libpixman, (so that it
-	will be easier to share patches between libpixman and the X
-	server).
-	
-2005-01-13  Carl Worth  <cworth at cworth.org>
-
-	* src/ictrap.c (IcRasterizeTrapezoid): Force alpha to 0 when the
-	left edge is entirely above top. (This is a workaround for some
-	bizarre edge effects in the current algorithm).
-	(IcRasterizeTrapezoid): Fix the above correction so that it
-	doesn't force 0 alpha when the left edge is positioned above but
-	slopes so as to contain some of the pixel.
-
-2005-01-07  Carl Worth  <cworth at cworth.org>
-
-	* src/icrop.h: 
-	* src/icint.h: Restore extern tag for variable declarations,
-	(accidentally removed when recently removing extern from function
-	prototypes).
-
-2005-01-04  Carl Worth  <cworth at cworth.org>
-
-	* src/ic.c (pixman_composite): Do nothing if src image has width
-	or height == 0 to avoid potential divide-by-zero.
-
-2004-12-23  Carl Worth  <cworth at cworth.org>
-
-	* src/slim_internal.h: Rename __internal_linkage to
-	pixman_private.
-
-	* src/icrop.h: 
-	* src/icint.h: 
-	* src/icimage.h: Track rename to pixman_private and move it to
-	before the function return value to quiet gcc warnings about
-	visibility attribute ignored for non-class type.
-
-	* configure.in: 
-	* src/Makefile.am (INCLUDES): Add the following warnings when
-	compiling with gcc: -Wall -Wpointer-arith -Wstrict-prototypes
-	-Wmissing-prototypes -Wmissing-declarations -Wnested-externs
-	-fno-strict-aliasing
-
-	* src/icrect.c (pixman_color_rects): Fix to actually call
-	pixman_fill_rect_32bpp in the 32 bpp case. Thanks to
-	TOKUNAGA Hiroyuki <tkng at xem.jp>.
-	(pixman_fill_rect_8bpp, pixman_fill_rect_32bpp): Fix typo in
-	naming: bbp -> bpp.
-
-2004-12-20  Alexander Larsson  <alexl at redhat.com>
-
-	* src/icrect.c: (pixman_fill_rect_8bbp), (pixman_fill_rect_32bbp),
-	(pixman_fill_rect_general), (pixman_color_rects),
-	(pixman_fill_rectangles):
-	Special case solid color rectangle fills.
-
-2004-10-28  Carl Worth  <cworth at cworth.org>
-
-	* Makefile.am (release-verify-newer): Abort release-publish if
-	there's already a published tar file with the current version.
-	(release-publish): Add code to update the LATEST-package-version
-	file.
-
-2004-10-27  Carl Worth  <cworth at cworth.org>
-
-	* RELEASING: Put the tag command back which was accidentally
-	removed from the instructions.
-
-	* NEWS: Update date since 0.1.2 release didn't get pushed out
-	until today.
-
-	* RELEASING: Update release instructions to include new
-	release-publish target.
-	Suggest "cvs -q update -Ad" as an alternative to checkout.
-
-	* Makefile.am (release-publish): Add release-check and
-	release-publish targets to simplify the release process.
-
-2004-10-13  Carl Worth  <cworth at cworth.org>
-
-	* NEWS: Add notes for snapshot 0.1.2
-
-	* configure.in: Increment version to 0.1.2
-
-	* src/icint.h (MOD): 
-	* src/iccompose.c (IcFetch_transform): 
-	* src/ic.c (pixman_composite): Switch from two different buggy mod
-	macros to a new MOD macro which should work in C89 or C99.
-
-2004-09-12  David Reveman  <c99drn at cs.umu.se>
-
-	* src/icformat.c (pixman_format_init): pixman_format_init expects
-	that all variables not touched are zero. We need to add a memset
-	here to make that true.
-	Added pixman_format_get_masks, which allow clients to get the
-	masks from a format.
-
-	* src/icimage.c: Added the implementation of pixman_image_get_format,
-	which was missing.
-
-	* src/icint.h: slim_hidden_proto pixman_image_set_component_alpha.
-
-	* src/pixman.h: Added pixman_image_set_component_alpha, making it
-	possible to use component alpha.
-
-	* src/icimage.c (pixman_image_set_clip_region): Make a copy of
-	the client owned region.
-	(IcComputeCompositeRegion): Intersect possible client region.
-	Added pixman_image_set_component_alpha.
-
-	* src/icint.h: Include "../config.h".
-	Define IMAGE_BYTE_ORDER and BITMAP_BIT_ORDER correctly.
-
-	* configure.in: Added AC_C_BIGENDIAN.
-
-	* src/ic.c (pixman_composite): 
-	* src/iccompose.c (IcFetch_transform, IcFetcha_transform): 
-	* src/icimage.h: Added support for both transform and repeat
-	(thanks to Owen Taylor <otaylor at redhat.com>).
-
-2004-05-06  Carl Worth  <cworth at isi.edu>
-
-	* src/icimage.c (pixman_image_set_clip_region): Leave
-	clientClipType as CT_NONE if region is NULL (thanks to Vladimir
-	Vukicevic <vladimir at pobox.com>).
-
-2004-04-16  Carl Worth  <cworth at isi.edu>
-
-	* NEWS: Add notes for snapshot 0.1.1
-
-	* configure.in: Increment LIBPIXMAN_VERSION to 0.1.1
-
-	* src/ictrap.c (IcCreateAlphaPicture): 
-	* src/icrect.c (pixman_color_rects): 
-	* src/pixregion.c (pixman_region16_print, pixman_region16_valid): 
-	* src/icint.h (IcBitsMask):
-	* src/icimage.h:
-	* src/icimage.c (pixman_image_change):
-	* src/icformat.c (pixman_format_create): 
-	* src/pixman.h: Fix bogus names such as PIXMAN_FORMAT_NAME_AR_GB32
-	that were left over from a broken search-and-replace. Normalize
-	structure defintions, (eg. struct _pixman_region16_t -> struct
-	pixman_region16). Normalize indentation.
-
-	* AUTHORS: Fix alphabetization.
-
-2004-02-24  Carl Worth  <cworth at isi.edu>
-
-	* AUTHORS: Added attribution for several authors after sifting
-	through the ChangeLog.
-	Fix email address for Anders Carlsson.
-
-2004-01-24  Carl Worth  <cworth at isi.edu>
-
-	* src/iccompose.c (IcFetch_transform): 
-	(IcFetcha_transform): Remove dead-code (useless n++).
-
-2004-01-22  Richard Worth <richard at theworths.org>
-
-	* src/Makefile.am: Add '-no-undefined' to end of
-	libpixman_la_LDFLAGS tp enable building shared libary under
-	cygwin.
-
-	* src/pixman.h: Remove all 'extern ' and ' __external_linkage'
-	(macro for __declspec(dllexport) and __declspec(dllimport))
-	from function declarations. These are no longer needed for cygwin.
-	
-2003-12-17  Carl Worth  <cworth at east.isi.edu>
-
-	* src/pixman.h: Remove trailing commas from enum, (some compilers
-	like to complain about this).
-
-2003-12-12  Dave Beckett  <Dave.Beckett at bristol.ac.uk>
-
-	* src/Makefile.am: Remove LIBPIXMAN_CFLAGS/LIBS cruft.
-	(libpixman_la_SOURCES): slim_export.h slim_import.h gone.
-
-2003-12-12  Carl Worth  <cworth at east.isi.edu>
-
-	* src/pixman.h: Fold contents of slim_export/import.h directly
-	into this file to avoid dependence on external slim package.
-
-	* src/icint.h:
-	* src/pixregionint.h: Use quote-based include now that
-	slim_internal is an internal file.
-	
-	* src/icint.h: Follow convention of other files for
-	multi-inclusion guard (_IC_INT_H_)
-	
-
-	* configure.in: Remove cruft.
-
-2003-12-10  Dave Beckett  <Dave.Beckett at bristol.ac.uk>
-
-	* update.pl: fixes for wrong order of renames
-
-	* src/pixregion.c, src/pixman.h, src/ictri.c, src/ictrap.c, src/icimage.c, src/icformat.c, src/ic.c:
-	Correct some more renames where the order of the renaming
-	caused later renames to fail due to earlier prefixes failing.
-
-	* update.pl: Add rename fixes
-
-	* src/pixregionint.h, src/pixregion.c, src/pixman.h, src/ictri.c, src/ictrap.c, src/ictransform.c, src/icrect.c, src/icpixels.c, src/icint.h, src/icimage.h, src/icimage.c, src/icformat.c, src/iccompose.c, src/iccolor.c:
-	Correct over-eager renames of the form pixman_thing_tName into
-	pixman_thing_name.  It was inevitable really this would happen!
-
-	* update.pl: Added helper script for updating names in source.
-
-	* src/pixregionint.h, src/pixregion.c, src/pixman.h, src/icutil.c, src/ictri.c, src/ictrap.c, src/ictransform.c, src/icstipple.c, src/icrop.h, src/icrect.c, src/icpixels.c, src/icint.h, src/icimage.h, src/icimage.c, src/icformat.c, src/iccompose.c, src/iccolor.c, src/icbltone.c, src/icblt.c, src/ic.c:
-	Rename exported Ic* and PixRegion* functions, types, enums
-	to be prefixed pixman (or PIXMAN for enum values)
-
-	* libpixman.pc.in, README: libpixman is the pixel manipulation library
-
-	* src/pixregionint.h, src/icint.h:
-	Change ic.h/pixregion.h headers inclusions to be pixman.h
-
-	* src/ic.h: Removed ic.h, merged into pixman.h
-
-	* src/pixman.h:
-	Merged pixregion.h (former name and CVS history of this file)
-	and ic.h (now CVS deleted here).
-
-	* src/Makefile.am:
-	Updated for libpixregion,libic to libpixman source merges.
-	Added -I$(srcdir) so we get internal headers from here even
-	when srcdir != builddir.
-
-	* libpixman.pc.in, configure.in, Makefile.am:
-	Updated for libpixregion,libic to libpixman package name, dependencies.
-
-	* README, COPYING, AUTHORS:
-	Merge of libic, slim AUTHORS, COPYING, README
-
-	* Initial repository copy of libpixregion, libic, slim CVS.
-
-	* Constructed a merged ChangeLog below via emacs VC mode (which rocks!)
-
-2003-12-09  Carl Worth  <cworth at isi.edu>
-
-	* ChangeLog.libpixregion, autogen.sh, ChangeLog.libic:
-	        * autogen.sh: Allow names of all autofoo programs to be
-	        overridden via environment variables.
-
-2003-11-25  Carl Worth  <cworth at isi.edu>
-
-	* ChangeLog.libic, src/icutil.c:
-	        * configure.in: Bump version to 0.1.5 for new 64-bit fixes.
-
-	        * src/icutil.c (icStipple8Bits): One more fix needed for 64-bit
-	        machine (alpha in this case). Thanks to Jakub Bogusz
-	        <qboosh at pld-linux.org>.
-
-2003-11-17  Carl Worth  <cworth at isi.edu>
-
-	* src/icrop.h, src/icutil.c, ChangeLog.libic:
-	        * src/icutil.c (icStipple1Bits):
-	        * src/icrop.h (IcStipple16Bits): Fixes needed to compile libic on
-	        x86_64. Many thanks to David R Bacon <dbacon at cis.ksu.edu>.
-
-2003-11-06  Carl Worth  <cworth at isi.edu>
-
-	* ChangeLog.libic, src/ic.h: Removed stale version from ic.h.
-	Better to have no version listed than the wrong one.
-
-2003-11-01  Carl Worth  <cworth at isi.edu>
-
-	* ChangeLog.libic, src/ic.h, src/icimage.c:
-	Add IcImageGetDepth. Bump version to 0.1.3
-
-2003-10-29  Carl Worth  <cworth at isi.edu>
-
-	* ChangeLog.libpixregion, configure.in, ChangeLog.libic:
-	Drop AC_CONFIG_AUX_DIR(config) as it was confusing "make distcheck"
-
-	* ChangeLog.libic, src/icimage.c, src/icimage.h:
-	Fix memory leak of image->transform.
-	Remove currently unused DevUnion type and IcImageChange function.
-
-	* ChangeLog.libic:
-	Bumped version to 0.1.2 to indicate new IcOperator type.
-
-	* ChangeLog.libic, src/ic.c, src/ic.h, src/icblt.c, src/icbltone.c, src/iccolor.c, src/iccompose.c, src/icimage.c, src/icimage.h, src/icint.h, src/icrect.c, src/ictransform.c, src/ictrap.c, src/ictri.c:
-	Patch from Bryan Worth <bryan at theworths.org> to eliminate lots of leftover,
-	undesired dependencies on X header files.
-
-2003-09-24  Carl Worth  <cworth at isi.edu>
-
-	* ChangeLog.slim:
-	Require __GNUC__ >= 3 before defining slim_hidden_def macro
-
-2003-09-23  Carl Worth  <cworth at isi.edu>
-
-	* src/slim_internal.h:
-	Require __GNUC__ >= 3 before defining slim_hidden_def macro
-
-2003-09-10  Carl Worth  <cworth at isi.edu>
-
-	* src/ic.c, src/iccolor.c, src/icformat.c, src/icimage.c, src/icrect.c, ChangeLog.libic, ChangeLog.libpixregion, configure.in, src/pixregion.c:
-	Updated calls to slim_hidden_def to track cahnges in slim 0.2.0
-
-	* ChangeLog.slim: Bump version number to 0.2.0
-
-	* ChangeLog.slim, src/slim_internal.h:
-	Remove ';' from slim_hidden_def. Bump version to 0.1.1
-
-2003-09-05  Carl Worth  <cworth at isi.edu>
-
-	* ChangeLog.libic, src/ic.c, src/ic.h, src/icblt.c, src/icbltone.c, src/iccolor.c, src/iccompose.c, src/icformat.c, src/icimage.c, src/icimage.h, src/icint.h, src/icpixels.c, src/icrect.c, src/icrop.h, src/icstipple.c, src/ictransform.c, src/ictrap.c, src/ictri.c, src/icutil.c:
-	Expose functions for creating IcFormat based on IcFormatName or masks.
-	The actual IcFormat struct is no longer exposed.
-	Bump version number to 0.1.1
-
-	* ChangeLog.libic: Portability fix for OpenBSD (from Michael Schubert)
-
-2003-09-02  Carl Worth  <cworth at isi.edu>
-
-	* src/ic.h: Portability fix for OpenBSD (from Michael Schubert)
-
-2003-08-19  Carl Worth  <cworth at isi.edu>
-
-	* autogen.sh: Add --enable-maintainer-mode to autogen.sh
-
-	* autogen.sh:
-	Fixed to give a better warning if pkg-config is not installed
-
-2003-08-01  Richard Henderson  <rth at twiddle.net>
-
-	* ChangeLog.libic, src/iccolor.c:
-		* src/iccolor.c (Ones): Define as __builtin_popcount when available.
-
-2003-07-31  Richard Henderson  <rth at twiddle.net>
-
-	* src/ic.c, src/ic.h, src/iccolor.c, src/iccompose.c, src/icformat.c, src/icimage.c, src/icimage.h, src/icint.h, src/icrect.c, src/icrop.h, src/ictri.c, ChangeLog.libic:
-	        * configure.in: Check for slim revision.
-	        * libic.pc.in: Depend on slim.
-
-	        * src/ic.c, src/iccompose.c: Don't include icimage.h.
-	        * src/icimage.h: Don't include ic.h.
-
-	        * src/ic.h: Include slim_{export,import}.h as appropriate.  Mark all
-	        symbols __external_linkage.
-	        * src/icint.h: Include slim_import.h; mark symbols __internal_linkage;
-	        add slim hidden_proto declarations.
-	        * src/icimage.h: Mark all symbols __internal_linkage.
-	        * src/icrop.h: Likewise.
-
-	        * src/ic.c (IcComposite): Provide hidden definition.
-	        * src/iccolor.c (IcColorToPixel): Likewise.
-	        * src/icformat.c (IcFormatInit): Likewise.
-	        * src/icimage.c (IcImageCreate, IcImageDestroy): Likewise.
-	        (IcImageSetRepeat): Likewise.
-	        * src/icrect.c (IcFillRectangles): Likewise.
-	        * src/tri.c (IcRasterizeTriangle): Make static.
-
-	* ChangeLog.slim, src/slim_internal.h:
-	        * src/slim_internal.h (__internal_linkage): Attribute visibility
-	        not present until gcc 3.3.
-
-	* src/icimage.h, src/icrop.h, src/icutil.c, ChangeLog.libic, src/ic.c, src/icbltone.c, src/iccompose.c:
-	        * src/ic.c: Make everything but IcComposite static.
-	        * src/iccompose.c: Make everything except IcBuildCompositeOperand
-	        and IcCompositeGeneral static.
-	        * src/icbltone.c (Ic8Lane, Ic16Lane, Ic32Lane): Make static.
-	        (IcLaneTable): Turn into a function.
-	        (IcBltOne): Make IcLane const.
-	        (icStipple24Bits): Make static.
-	        * src/icimage.h: Remove lots of now static declarations.
-	        * src/icrop.h: Likewise.
-	        * src/icutil.c (icStipple8Bits, icStipple4Bits): Make static.
-	        (icStipple2Bits, icStipple1Bits): Make static.
-	        (IcStippleTable): Turn into a function.
-
-2003-07-30  Carl Worth  <cworth at isi.edu>
-
-	* ChangeLog.libic, src/ic.h: Committing missed ChangeLog entry
-
-	* ChangeLog.libic, src/ic.h:
-	Fixed IcRectangle to be compatible with XRectangle.
-
-	* ChangeLog.libpixregion, configure.in, src/pixman.h:
-	Removed false dependency on X.
-
-2003-07-30  Richard Henderson  <rth at twiddle.net>
-
-	* ChangeLog.slim:
-	        * Makefile.am (EXTRA_DIST, pkgconfigdir, pkgconfig_DATA): New.
-	        * configure.in (AC_OUTPUT): Add slim.pc.
-	        * slim.pc.in: New file.
-
-	* ChangeLog.libpixregion, configure.in, libpixman.pc.in, src/pixman.h, src/pixregion.c, src/pixregionint.h:
-	        * configure.in: Run PKG_CHECK_MODULES on slim.
-	        * libpixregion.pc.in: Require slim.
-	        * src/pixregion.c (PixRegionCreateSimple): Mark hidden.
-	        (PixRegionCopy, PixRegionUnion): Mark hidden.
-	        * src/pixregion.h: Include and use X11/Xfuncproto.h.  Include
-	        slim_{export,import}.h as appropriate.  Mark all functions with
-	        __external_linkage.
-	        * src/pixregionint.h: Rename include protect to _PIXREGIONINT_H_.
-
-	* src/slim_export.h, src/slim_import.h, src/slim_internal.h, ChangeLog.slim:
-	        * src/slim_internal.h: New file.
-	        * src/slim_export.h: New file.
-	        * src/slim_import.h: New file.
-	        * src/Makefile.am (include_HEADERS): Add them.
-	        * configure.in (AC_INIT): Check for src/slim_export.h
-
-2003-07-30  Carl Worth  <cworth at isi.edu>
-
-	* ChangeLog.slim: Initial commit of slim shell
-
-2003-07-29  Carl Worth  <cworth at isi.edu>
-
-	* src/ic.c, src/ic.h, src/iccompose.c, src/icimage.h, src/icint.h:
-	Replaced CARD*/INT* datatypes with stdint types (vektor at dumbterm.net).
-
-2003-07-10  Anders Carlsson  <andersca at codefactory.se>
-
-	* ChangeLog.libic:
-	2003-07-10  Anders Carlsson  <andersca at codefactory.se>
-
-		* autogen.sh:
-		Pass --enable-maintainer-mode to configure
-
-		* configure.in:
-		Add compiler warning flags to CFLAGS.
-
-2003-07-09  Anders Carlsson  <andersca at codefactory.se>
-
-	* src/ic.h, src/icimage.c, ChangeLog.libic:
-	2003-07-09  Anders Carlsson  <andersca at codefactory.se>
-
-		* src/ic.h:
-		* src/icimage.c: (IcImageGetData):
-		Add accessor for getting a pointer to the image data.
-
-2003-07-08  Anders Carlsson  <andersca at codefactory.se>
-
-	* src/ic.h, src/icimage.c, ChangeLog.libic:
-	2003-07-09  Anders Carlsson  <andersca at codefactory.se>
-
-		* src/ic.h:
-		* src/icimage.c: (IcImageGetWidth), (IcImageGetHeight),
-		(IcImageGetStride):
-		Add accessors.
-
-2003-05-29  Carl Worth  <cworth at isi.edu>
-
-	* src/ic.c, src/iccompose.c: Cleanup of some stale unused code.
-
-2003-05-15  Carl Worth  <cworth at isi.edu>
-
-	* src/ic.h, src/iccompose.c, src/icimage.c, src/icimage.h,
-	src/icint.h, src/ictransform.c, ChangeLog.libic: Fixed
-	transform/filter support
-
-2003-05-05  Carl Worth  <cworth at isi.edu>
-
-	* ChangeLog.libic, src/ictrap.c:
-	Avoid crash in IcCompositeTrapezoids when there's nothing to draw.
-
-2003-04-26  Carl Worth  <cworth at isi.edu>
-
-	* ChangeLog.libic, src/icimage.c, src/icimage.h: Fixed memory leak
-
-2003-04-25  Carl Worth  <cworth at isi.edu>
-
-	* ChangeLog.libic, src/ic.h, src/icint.h, src/icrect.c,
-	src/ictrap.c, src/ictri.c: Remove X datatypes from public
-	interface
-
-	* configure.in, src/Makefile.am, src/pixman.h, src/pixregionint.h:
-	Fixed libtool versioning
-
-	* ChangeLog.libic, src/ic.h:
-	Fixed to not reference XFixed. Fixed libtool versioning
-
-2003-04-23  Carl Worth  <cworth at isi.edu>
-
-	* src/ic.h: extern "C" stuff to support C++ (Fredrik Höglund)
-
-2003-04-22  Carl Worth  <cworth at isi.edu>
-
-	* ChangeLog.libpixregion, configure.in: Fixed typo (Owen Taylor)
-
-2003-04-17  Carl Worth  <cworth at isi.edu>
-
-	* ChangeLog.libic, src/ic.c, src/ic.h, src/iccolor.c,
-	src/iccompose.c, src/icformat.c, src/icimage.c, src/icimage.h,
-	src/icint.h, src/icpixels.c, src/icrect.c, src/ictrap.c,
-	src/ictri.c: Removed reliance on server headers. Reowrked IcFormat
-
-2003-03-05  Carl Worth  <cworth at isi.edu>
-
-	* ChangeLog.libic, src/ic.h, src/icimage.h, src/icint.h:
-	Updated to use libpixregion
-
-2003-02-25  Carl Worth  <cworth at isi.edu>
-
-	* src/ic.c, src/ic.h, src/iccompose.c, src/icimage.c,
-	src/icimage.h, src/icint.h, src/ictrap.c, src/ictri.c: updated to
-	use libpixregion instead of Xlib region code
-
-	* ChangeLog.libpixregion, src/pixman.h, src/pixregion.c: API cleanup
-
-	* src/.cvsignore, src/Makefile.am, src/pixman.h, src/pixregion.c,
-	src/pixregionint.h: Initial import of libpixregion
-
-	* src/.cvsignore, src/Makefile.am, src/pixman.h, src/pixregion.c,
-	src/pixregionint.h: New file.
-
-	* .cvsignore, AUTHORS, COPYING, ChangeLog.libpixregion, INSTALL,
-	Makefile.am, NEWS, README, autogen.sh, configure.in,
-	libpixman.pc.in: Initial import of libpixregion
-
-	* .cvsignore, AUTHORS, COPYING, ChangeLog.libpixregion, INSTALL,
-	Makefile.am, NEWS, README, autogen.sh, configure.in,
-	libpixman.pc.in: New file.
-
-2003-02-21  Carl Worth  <cworth at isi.edu>
-
-	* src/ic.h, src/icimage.h, src/icint.h, src/ictrap.c, src/ictri.c:
-	Added triangle support
-
-	* src/ictransform.c, ChangeLog.libic, src/ic.c, src/icbltone.c,
-	src/iccompose.c, src/icformat.c, src/icimage.c, src/icimage.h,
-	src/icint.h, src/icutil.c: Some reorganization and cruft removal
-
-	* src/ic.c, src/ic.h, src/icimage.c, src/icint.h, src/icpixels.c,
-	src/icstipple.c, src/ictrap.c: Started cleaning up public libic
-	interface
-
-	* src/icimage.h, src/icint.h, src/icrop.h:
-	Initial import of libic code, (still very preliminary).
-
-	* src/icimage.h, src/icint.h, src/icrop.h: New file.
-
-	* src/ictrap.c, src/ictri.c, src/icutil.c:
-	Initial import of libic code, (still very preliminary).
-
-	* src/ictrap.c, src/ictri.c, src/icutil.c: New file.
-
-	* src/iccompose.c, src/icformat.c, src/icimage.c, src/icpixels.c, src/icrect.c, src/icstipple.c:
-	Initial import of libic code, (still very preliminary).
-
-	* src/iccompose.c, src/icformat.c, src/icimage.c, src/icpixels.c, src/icrect.c, src/icstipple.c:
-	New file.
-
-	* src/icbltone.c:
-	Initial import of libic code, (still very preliminary).
-
-	* src/icbltone.c: New file.
-
-	* src/ic.c, src/ic.h, src/icblt.c:
-	Initial import of libic code, (still very preliminary).
-
-	* src/ic.c, src/ic.h, src/icblt.c: New file.
-
-	* ChangeLog.libic:
-	Initial import of libic code, (still very preliminary).
-
-	* ChangeLog.libic: New file.
-
diff --git a/pixman/ChangeLog.libic b/pixman/ChangeLog.libic
deleted file mode 100644
index d6d709f..0000000
--- a/pixman/ChangeLog.libic
+++ /dev/null
@@ -1,300 +0,0 @@
-2003-12-08  Carl Worth  <cworth at isi.edu>
-
-	* autogen.sh: Allow names of all autofoo programs to be
-	overridden via environment variables.
-
-2003-11-25  Carl Worth  <cworth at east.isi.edu>
-
-	* configure.in: Bump version to 0.1.5 for new 64-bit fixes.
-
-	* src/icutil.c (icStipple8Bits): One more fix needed for 64-bit
-	machine (alpha in this case). Thanks to Jakub Bogusz
-	<qboosh at pld-linux.org>.
-
-2003-11-17  Carl Worth  <cworth at isi.edu>
-
-	* src/icutil.c (icStipple1Bits): 
-	* src/icrop.h (IcStipple16Bits): Fixes needed to compile libic on
-	x86_64. Many thanks to David R Bacon <dbacon at cis.ksu.edu>.
-
-2003-11-06  Carl Worth  <cworth at east.isi.edu>
-
-	* configure.in: Bump version to 0.1.4 just to mark removal of the
-	version from ic.h, (so not an interesting change and nothing worth
-	upgrading to).
-
-	* src/ic.h: Remove IC_MAJOR, IC_MINOR, and IC_REVISION, (which
-	were stale anyway so less than useful).
-
-2003-10-31  Carl Worth  <cworth at isi.edu>
-
-	* configure.in (LIBIC_VERSION): Bump version to 0.1.3 for new IcImageGetDepth.
-
-	* src/icimage.c (IcImageGetDepth): Add IcImageGetDepth.
-
-2003-10-29  Carl Worth  <cworth at isi.edu>
-
-	* src/icimage.h: Remove currently unused DevUnion datatype to
-	squelch compiler warning.  Remove prototype for currently
-	unimplemented IcImageChange function.
-
-	* src/icimage.c (IcImageDestroy): Fixed memory leak of
-	image->transform.
-
-2003-10-29  Carl Worth  <cworth at east.isi.edu>
-
-	* configure.in: Drop AC_CONFIG_AUX_DIR(config) as it was confusing
-	"make distcheck"
-
-2003-10-29  Carl Worth  <cworth at east.isi.edu>
-
-	* configure.in: Bumped version to 0.1.2 to indicate new IcOperator
-	type.
-
-	* Everywhere: A large patch from Bryan Worth <bryan at theworths.org>
-	to eliminate lots of leftover, undesired dependencies on X header
-	files. More details below:
-
-	* src/ictransform.c:
-	* src/ictrap.c:
-	* src/ictri.c:
-	* src/icrect.c:
-	* src/iccompose.c:
-	* src/iccolor.c:
-	* src/icbltone.c:
-	* src/icblt.c:
-	* src/icimage.h:
-	* src/icimage.c:
-	* src/ic.c:
-	Replace CARD8/16/32 with uint8/16/32_t.
-	Replace INT16 with int16_t.
-	Use IcOperator in place of char or uint8_t.
-	Replace Bool/FALSE/TRUE with int/0/1.
-
-	* src/icint.h: Remove includes of X11/X.h, X11/Xmd.h,
-	X11/Xprotostr.h and X11/extensions/Xrender.h.  Add IcPoint.  Lift
-	definitions from X headers for Mask, GXor, ClipByChildren,
-	PolyEdgeSharp, PolyModePrecise, CPClipMask, and CPLastBit.
-
-	* src/icimage.h: Remove includes of X11/Xdefs.h and X11/Xprotostr.h.
-	Replace "pointer" with "void *".
-	Remove include of X11/Xutil.h.
-	Replace DDXPointRec with IcPoint.
-	Replace Atom/XID with unsigned long.
-
-	* src/icimage.c: Remove instances of BadAlloc and Success.
-	Replace XID with unsigned int.
-	Replace	"pointer" with "void *".
-	Replace Atom with unsigned long.
-
-	* src/ic.h: Introduce new IcOperator enum, rather than using char
-	or uint8_t.
-
-2003-09-09  Carl Worth  <cworth at isi.edu>
-
-	* configure.in (SLIM_REQUIRED): Updated calls to slim_hidden_def
-	to track changes in slim 0.2.0.
-
-2003-09-05  Carl Worth  <cworth at isi.edu>
-
-	* configure.in (LIBIC_VERSION): Bumped version to 0.1.1.
-
-	* src/ictrap.c (IcCreateAlphaPicture): Fixed memory leak.
-
-	* src/icimage.h: icimage->image_format now a struct not a
-	pointer. Rename integral format_name to format_code.
-
-	* src/iccompose.c: Remove unused functions: IcCombineSaturateU,
-	IcCombineSaturateC, IcFetch_a2b2g2r2, IcFetch_c8, IcFetch_c4,
-	IcFetch_g1, IcStore_c8, IcStore_g8, IcStore_c4, IcStore_g4,
-	IcStore_g1.
-
-	* src/iccolor.c (_IcOnes): Rename Ones to _IcOnes and expose it
-	for internal use.
-
-	* src/ic.h: Changed IcFormatName from an int to an enum.
-	Changed IcFormat from an exposed struct to an opaque type.
-	Now expose IcFormatCreate, IcFormatCreateMasks, and
-	IcFormatDestroy.
-
-2003-09-02  Carl Worth  <cworth at isi.edu>
-
-	* src/ic.h: Include inttypes.h rather than stdint.h on OpenBSD,
-	(Michael Schubert <michael at schubert.cx>)
-
-2003-07-31  Richard Henderson  <rth at twiddle.net>
-
-	* src/iccolor.c (Ones): Define as __builtin_popcount when available.
-
-2003-07-31  Richard Henderson  <rth at twiddle.net>
-
-	* configure.in: Check for slim revision.
-	* libic.pc.in: Depend on slim.
-
-	* src/ic.c, src/iccompose.c: Don't include icimage.h.
-	* src/icimage.h: Don't include ic.h.
-
-	* src/ic.h: Include slim_{export,import}.h as appropriate.  Mark all
-	symbols __external_linkage.
-	* src/icint.h: Include slim_import.h; mark symbols __internal_linkage;
-	add slim hidden_proto declarations.
-	* src/icimage.h: Mark all symbols __internal_linkage.
-	* src/icrop.h: Likewise.
-
-	* src/ic.c (IcComposite): Provide hidden definition.
-	* src/iccolor.c (IcColorToPixel): Likewise.
-	* src/icformat.c (IcFormatInit): Likewise.
-	* src/icimage.c (IcImageCreate, IcImageDestroy): Likewise.
-	(IcImageSetRepeat): Likewise.
-	* src/icrect.c (IcFillRectangles): Likewise.
-	* src/tri.c (IcRasterizeTriangle): Make static.
-
-2003-07-31  Richard Henderson  <rth at twiddle.net>
-
-	* src/ic.c: Make everything but IcComposite static.
-	* src/iccompose.c: Make everything except IcBuildCompositeOperand
-	and IcCompositeGeneral static.
-	* src/icbltone.c (Ic8Lane, Ic16Lane, Ic32Lane): Make static.
-	(IcLaneTable): Turn into a function.
-	(IcBltOne): Make IcLane const.
-	(icStipple24Bits): Make static.
-	* src/icimage.h: Remove lots of now static declarations.
-	* src/icrop.h: Likewise.
-	* src/icutil.c (icStipple8Bits, icStipple4Bits): Make static.
-	(icStipple2Bits, icStipple1Bits): Make static.
-	(IcStippleTable): Turn into a function.
-
-2003-07-30  Carl Worth  <cworth at isi.edu>
-
-	* src/ic.h: Fixed IcRectangle to be compatible with XRectangle.
-
-2003-07-29  Billy Biggs  <vektor at dumbterm.net>
-
-	* src/ic.h: Changed all references to CARD*/INT* to use stdint
-	names, (eg. uint32_t, int32_t).
-
-2003-07-10  Anders Carlsson  <andersca at codefactory.se>
-
-	* autogen.sh:
-	Pass --enable-maintainer-mode to configure
-	
-	* configure.in:
-	Add compiler warning flags to CFLAGS.
-	
-2003-07-09  Anders Carlsson  <andersca at codefactory.se>
-
-	* src/ic.h:
-	* src/icimage.c: (IcImageGetData):
-	Add accessor for getting a pointer to the image data.
-	
-2003-07-09  Anders Carlsson  <andersca at codefactory.se>
-
-	* src/ic.h:
-	* src/icimage.c: (IcImageGetWidth), (IcImageGetHeight),
-	(IcImageGetStride):
-	Add accessors.
-	
-2003-05-14  Carl Worth  <cworth at isi.edu>
-
-	* src/ic.h: Add IcImageSetFilter. Fixed transform support.
-
-2003-05-05  Carl Worth  <cworth at isi.edu>
-
-	* src/ictrap.c (IcCompositeTrapezoids): Avoid crash if there's
-	nothing to draw.
-
-2003-04-26  Carl Worth  <cworth at isi.edu>
-
-	* src/icimage.c (IcImageDestroy): Fix memory leak of image->pixels
-	when owns_pixels == 1;
-
-2003-04-25  Carl Worth  <cworth at east.isi.edu>
-
-	* src/ic.h (IC_REVISION): Added #defines for version.
-	Don't reference undefined XFixed datatype.
-	Added IcFixed16_16, IcPointFixed, IcLineFixed, IcRectangle,
-	IcTriangle, and IcTrapzezoid to eliminate X datatypes in public
-	interface.
-
-	* configure.in: Fixed libtool versioning.
-
-2003-04-17  Carl Worth  <cworth at isi.edu>
-
-	* src/icint.h: Removed reliance on some server include files,
-	(this included copy and paste of Xserver/render/picture.h into
-	icint.h)
-
-	* src/icformat.c (IcFormatInit): Replaced public
-	IcFormatCreate/IcFormatDestroy with IcFormatInit and an exposed
-	IcFormat structure.
-	(_IcFormatCreate): Tracked changes now that IcFormat no longer has
-	direct and indexed sub-structure.
-
-	* src/iccompose.c: Commented out all code supporting indexed
-	formats.
-
-	* src/ic.h: Expose IcFormat structure, (with no support for
-	indexed formats).
-
-	* src/ic.c (IcComposite): Track changes in IcImage structure
-	(format vs. format_name)
-
-2003-03-10  Carl Worth  <cworth at isi.edu>
-
-	* src/Makefile.am (INCLUDES): Cleaned up to no longer require
-	includes from X server source tree.
-
-2003-03-05  Carl Worth  <cworth at isi.edu>
-
-	* src/ictri.c (IcTriangles): 
-	(IcTriStrip): 
-	(IcTriFan): fixed argument order to match XRender
-
-	* src/icrect.c (IcRectangle): Add IcRectangle convenience function.
-	(IcRectangles): fixed argument order to match XRender
-
-	* src/ictri.c (IcTriangles): 
-	(IcTriStrip): 
-	(IcTriFan): Removed format argument from IcTri* functions.
-
-	* src/ictrap.c (IcTrapezoids): Removed format argument from
-	IcTrapezoids.
-
-	* src/icrect.c (IcRectangles): Initial (painfully slow)
-	implementation of IcRectangles.
-
-	* src/icimage.c (IcImageCreate): Simplified IcImageCreate, (no
-	longer requires mask/vlist/error/error_value)
-	(IcImageSetRepeat): Added IcImageSetRepeat
-	(IcImageSetClipRegion): Implemented simple IcImageSetClipRegion.
-
-2003-02-25  Carl Worth  <cworth at isi.edu>
-
-	* src/icimage.c (IcImageInit):
-	(IcImageDestroy):
-	(IcImageDestroyClip):
-	(IcClipImageReg):
-	(IcClipImageSrc):
-	(IcClipImageSrc):
-	(SetPictureClipRects):
-	(IcComputeCompositeRegion): Converted to use libpixregion rather
-	than region code from Xlib.
-	
-	* src/iccompose.c (IcFetch_transform): Converted to use
-	libpixregion rather than region code from Xlib.
-
-	* src/ic.c (IcComposite): Converted to use libpixregion rather
-	than region code from Xlib.
-
-2003-02-21  Carl Worth  <cworth at isi.edu>
-
-	* src/ictri.c (IcRasterizeTriangle): Added triangle support to
-	libic.
-
-	* src/ic.h: Started cleaning up the public interface of
-	libic. Moved most of the cruft into icint.h.
-
-2003-02-20  Carl Worth  <cworth at isi.edu>
-
-	* AUTHORS: Added AUTHORS, NEWS, ChangeLog.
-
diff --git a/pixman/ChangeLog.libpixregion b/pixman/ChangeLog.libpixregion
deleted file mode 100644
index 75b071e..0000000
--- a/pixman/ChangeLog.libpixregion
+++ /dev/null
@@ -1,47 +0,0 @@
-2003-12-08  Carl Worth  <cworth at isi.edu>
-
- 	* autogen.sh: Allow names of all autofoo programs to be
-	overridden via environment variables.
-
-2003-10-29  Carl Worth  <cworth at east.isi.edu>
-
-	* configure.in:  Drop AC_CONFIG_AUX_DIR(config) as it was confusing
-	"make distcheck"
-
-2003-09-09  Carl Worth  <cworth at isi.edu>
-
-	* configure.in (SLIM_REQUIRED): Updated calls to slim_hidden_def
-	to track changes in slim 0.2.0.
-
-2003-07-30  Carl Worth  <cworth at east.isi.edu>
-
-	* src/pixregion.h: Implement our own 'extern "C"' block to avoid
-	false dependency on X.
-
-	* configure.in: Remove unnecessary AC_PATH_XTRA check for X
-	headers.
-
-2003-07-30  Richard Henderson  <rth at twiddle.net>
-
-	* configure.in: Run PKG_CHECK_MODULES on slim.
-	* libpixregion.pc.in: Require slim.
-	* src/pixregion.c (PixRegionCreateSimple): Mark hidden.
-	(PixRegionCopy, PixRegionUnion): Mark hidden.
-	* src/pixregion.h: Include and use X11/Xfuncproto.h.  Include
-	slim_{export,import}.h as appropriate.  Mark all functions with
-	__external_linkage.
-	* src/pixregionint.h: Rename include protect to _PIXREGIONINT_H_.
-
-2003-04-22  Carl Worth  <cworth at isi.edu>
-
-	* configure.in (LIBPIXREGION_MAJOR_VERSION): Fixed typo (Owen Taylor)
-
-2003-02-25  Carl Worth  <cworth at isi.edu>
-
-	* src/pixregion.c (PixRegionCreateSimple): Eliminated useless size
-	parameter from PixRegionCreateSized, (the server only ever calls
-	it with a value of 1 or 0).
-	(PixRegionInit): 
-	(PixRegionUninit): 
-	(PixRegionBreak): Changed these three functions to be static.
-
diff --git a/pixman/ChangeLog.slim b/pixman/ChangeLog.slim
deleted file mode 100644
index c830bf7..0000000
--- a/pixman/ChangeLog.slim
+++ /dev/null
@@ -1,39 +0,0 @@
-2003-09-23  Carl Worth  <cworth at east.isi.edu>
-
-	* src/slim_internal.h: The slim_hidden_def macros were causing
-	build failures with gcc 2.95.4. I've bumped the test for these
-	macros up to: __GNUC__ >= 3. We'll see if that's sufficient.
-
-2003-09-09  Carl Worth  <cworth at isi.edu>
-
-	* configure.in (SLIM_VERSION): Bump version number to 0.2.0
-	instead, (this is an incompatible change after all).
-	
-	* configure.in (SLIM_VERSION): Bump version number to 0.1.1
-
-	* src/slim_internal.h (slim_hidden_def): Remove ';' from macro
-	definition, (forcing the user to provide it which looks better
-	anyway). This also helps to avoid confusing etags.
-
-2003-07-31  Richard Henderson  <rth at twiddle.net>
-
-	* src/slim_internal.h (__internal_linkage): Attribute visibility
-	not present until gcc 3.3.
-
-2003-07-30  Richard Henderson  <rth at twiddle.net>
-
-	* Makefile.am (EXTRA_DIST, pkgconfigdir, pkgconfig_DATA): New.
-	* configure.in (AC_OUTPUT): Add slim.pc.
-	* slim.pc.in: New file.
-
-2003-07-30  Richard Henderson  <rth at twiddle.net>
-
-	* src/slim_internal.h: New file.
-	* src/slim_export.h: New file.
-	* src/slim_import.h: New file.
-	* src/Makefile.am (include_HEADERS): Add them.
-	* configure.in (AC_INIT): Check for src/slim_export.h
-
-2003-07-29  Carl Worth  <cworth at isi.edu>
-
-	* Create package skeleton.
diff --git a/pixman/INSTALL b/pixman/INSTALL
deleted file mode 100644
index 5ccf1c3..0000000
--- a/pixman/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-This code uses automake, in order to generate the Makefiles use:
-
-	$ autogen.sh
-
-After that, standard build procedures apply:
-
-	$ make
-	# make install
-
diff --git a/pixman/Makefile.am b/pixman/Makefile.am
deleted file mode 100644
index 92ac1e4..0000000
--- a/pixman/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-SUBDIRS = src
-
-EXTRA_DIST = \
-	COPYING \
-	ChangeLog.libic \
-	ChangeLog.libpixregion \
-	ChangeLog.slim
diff --git a/pixman/NEWS b/pixman/NEWS
deleted file mode 100644
index cb41258..0000000
--- a/pixman/NEWS
+++ /dev/null
@@ -1,135 +0,0 @@
-Snapshot 0.1.6 (2005-07-28 Carl Worth <cworth at cworth.org>)
-==========================================================
-Behavioral changes
-------------------
-Clips are changed to only affect destination operands, not
-sources. This gives the desired behavior for cairo. If the X server's
-Render implementation wants to use pixman it will have to select
-source clipping, (presumably through a new API call that we can add at
-that point).
-
-Bug fixes
----------
-Fix leak of the clip region associated with an image in
-pixman_image_destroy.
-
-Fix units for stride return to be FbStip-sized, (this bug was causing
-non antialiased text in cairo to appear as garbage).
-
-Other changes
--------------
-The implementation has been merged considerably with xserver/fb. Most
-of the merge was just name changes, but there were likely some bug
-fixes or performance improvements in there as well.
-
-Snapshot 0.1.5 (2005-05-18 Carl Worth <cworth at cworth.org>)
-==========================================================
-Bug fixes
----------
-Fix confusion of depth and bpp which was causing cairo to crash on
-some X servers.
-
-Properly declare pixman_fixed16_16_t as int32_t which fixes
-compilation failures on some platforms.
-
-Fix to find inttypes.h on AIX.
-
-Fix bug in compositing when the source image has no alpha channel.
-
-Some fixes to the clipping code.
-
-Fix memory leak when asked to draw a degenerate trapezoid list.
-
-Snapshot 0.1.4 (2005-03-07 Carl Worth <cworth at cworth.org>)
-==========================================================
-API Addition
-------------
-Add new function:
-
-	void
-	pixman_add_trapezoids (pixman_image_t           *dst,
-	                       int                      x_off,
-	                       int                      y_off,
-	                       const pixman_trapezoid_t *traps,
-	                       int                      ntraps);
-
-Performance improvement
------------------------
-Restrict size of intermediate surface used while compositing
-trapezoids based on the bounds of the desination surface.
-
-Bug fixes
----------
-Fix rendering on 64-bit platforms.
-
-Snapshot 0.1.3 (2005-01-21 Carl Worth <cworth at cworth.org>)
-==========================================================
-Performance improvements
-------------------------
-Solid fills are now much faster, (thanks to Alexander Larsson).
-
-Bug fixes
----------
-Fixed to quiet warnings in newer versions of gcc.
-
-Don't divide-by-zero if given an image of size 0x0.
-
-Fixed several corner cases where values outside a trapezoid would be
-drawn with alpha 1/255 (in the 8-bit case).
-
-Internal changes
-----------------
-Imported the newer point-sampling trapezoid rasterization code that
-Keith Packard wrote for the X server. This provide pixel-perfect
-matching with the Render extension as well as code that is simpler,
-more robust, and easier to maintain.
-
-Snapshot 0.1.2 (2004-10-27 Carl Worth <cworth at cworth.org>)
-==========================================================
-New functionality
------------------
-Added three new functions:
-
-	pixman_image_set_component_alpha
-	pixman_format_get_masks
-	pixman_image_get_format
-
-The first enables component-alpha compositing which can be used for
-optimizing sub-pixel rendering of text and other geometry. This is
-useful when the geometrical relationship of the sub-pixel components
-of the display device are known, (eg. with flat-panel monitors rather
-than CRTs).
-
-The other two functions are simple query functions that were missing.
-
-Bug fixes
----------
-Enabling both transform and repeat simultaneously now works.
-Some byte-order fixes.
-Clipping fixes: pixman now takes a copy of the client clipping region
-                client clipping is now actually used, it wasn't earlier.
-
-Snapshot 0.1.1 (2004-04-16 Carl Worth <cworth at east.isi.edu>)
-============================================================
-Build fixes for cygwin
-----------------------
-This snapshot adds the -no-undefined flag during compilation which is
-necessart for building a shared library under cygwin.
-
-Cleanup of the public API
--------------------------
-We recently noticed that there were a coupld of bugs in the script
-that renamed libic to libpixman. Fixing this requires the following
-changes in the public API:
-
-	PIXMAN_FORMAT_AR_GB32 -> PIXMAN_FORMAT_ARGB32
-	PIXMAN_FORMAT_RG_B24 -> PIXMAN_FORMAT_RGB24
-
-While we're changing that, we also normalized the names of structure
-tags, for example:
-
-	struct _pixman_region16_t -> struct pixman_region16
-	etc.
-
-but users are expected to use typedefs such as pixman_region16_t
-anyway.
diff --git a/pixman/README b/pixman/README
deleted file mode 100644
index 621ab94..0000000
--- a/pixman/README
+++ /dev/null
@@ -1,47 +0,0 @@
-libpixman - Pixel manipulation library
-
-libpixman is a merge of libpixregion and libic.
-It also includes the slim headers.
-
-----------------------------------------------------------------------
-libpixregion - Pixel region Library
-
-libpixregion is a generic library for manipulating pixel regions. A
-PixRegion is a set of Y-X banded rectangles that cover the desired
-region.
-
-The original code for libxregion was part of the reference X server
-implementation of the X Window System. A modified copy of the code
-also exists in the Xlib client library. libpixregion was formed so
-that both the X server and client libraries could share common code
-for region manipulation.
-
-libpixregion is also intended to be applicable outside of the X Window
-System. The public interface of libpixregion does not depend on any
-part of the X Window System.
-
-----------------------------------------------------------------------
-libic - Image compositing library
-
-libic is a generic image compositing library. libic provides
-Porter/Duff compositing of images and implicit mask generation for
-geometric primitives including trapezoids, triangles, and rectangles.
-
-The semantics of libic are designed to precisely match the
-specification of the X Render extension. In fact, the initial
-implementation of libic was lifted from the reference implementation
-of RENDER from the X server.
-
-However, libic is intended to be useful independent of the X Window
-System. The public interface exported by libic does not contain any
-X-specific data structures.
-
-Carl Worth
-cworth at isi.edu
-
-Keith Packard (keithp at keithp.com) originally wrote all the original
-RENDER code that was yanked out to become libic. Keith also provided
-impetus and guidance in the development of libic.
-
-----------------------------------------------------------------------
-slim - Shared Library Interface Macros
diff --git a/pixman/RELEASING b/pixman/RELEASING
deleted file mode 100644
index bb7ad05..0000000
--- a/pixman/RELEASING
+++ /dev/null
@@ -1,81 +0,0 @@
-So far, libpixman hasn't reached an initial release. But we can still form
-good habits now by practicing the release process with the current
-snapshots.
-
-A new snapshot is needed whenever significant new features or bug
-fixes are committed. Here are the steps to follow:
-
-1) Ensure that there are no local, uncommitted modifications. The best
-   thing to do here may be to begin with a fresh checkout from CVS:
-
-	cvs -d cairographics.org:/cvs/cairo co libpixman
-
-   But it's probably good enough if "cvs -q update -Ad" generates no
-   output.
-
-2) Verify that the code passes "make distcheck"
-
-	Running "make distcheck" should result in no warnings or
-	errors and end with a message of the form:
-
-	================================================
-	libpixman-X.Y.Z.tar.gz is ready for distribution
-	================================================
-
-	(But the tar file isn't actually ready yet, as we still have
-	some more steps to follow).
-
-3) Fill out an entry in the NEWS file
-
-	Sift through the information in ChangeLog since the last
-	snapshot. Summarize major changes briefly in a style similar
-	to other entries in NEWS. Take special care to note any
-	incompatible changes in the API. These should be easy to find
-	by looking for pixman.h in the ChangeLog. Additionally, the
-	output of the following command should be examined using the
-	previous snapshot tag:
-
-		cvs diff -r SNAPSHOT_X_Y_Z src/pixman.h
-
-4) Increment LIBPIXMAN_VERSION in configure.in
-
-	First, remove the "-head" suffix, then increment the version
-	as follows:
-
-	If there are backward-incompatible changes in the API,
-	(function removals, or semantic changes), increment the minor
-	number and reset the sub-minor number to 0.
-
-	Otherwise, (that is, if there are only bug fixes and perhaps
-	API additions), then increment only the sub-minor number.
-
-	Prior to the initial "1.0" release of cairo, leave the major
-	number at 0. Also, do not modify the "libtool shared library
-	version" variables, (LT_CURRENT, LT_VERSION, LT_AGE).
-
-5) Commit the changes to NEWS and configure.in
-
-	Don't forget to fill out the ChangeLog just like with any
-	other commit. It's especially important to mention the new
-	version number in the ChangeLog.
-
-6) Run "make release-publish" which will perform the following steps
-   for you:
-
-	* Check that no release exists with the current version
-	* Verify that make distcheck completes successfully
-	* Generate the final tar file
-	* Generate an md5sum file
-	* scp both files to appear on http://cairographics.org/snapshots
-	* Create a LATEST-package-version file (after deleting any old one)
-	* Place local copies of both files in the releases directory
-	* Provide some text for the release announcement (see below).
-
-7) Tag the entire source tree with a tag of the form SNAPSHOT_X_Y_Z:
-
-	cvs tag SNAPSHOT_X_Y_Z
-
-8) Add a "-head" to LIBPIXMAN_VERSION in configure, and commit.
-
-9) Send a message to cairo-announce at cairographics.org to announce the
-   new snapshot using the text provided from "make release-publish".
diff --git a/pixman/TODO b/pixman/TODO
deleted file mode 100644
index 5560d8d..0000000
--- a/pixman/TODO
+++ /dev/null
@@ -1,10 +0,0 @@
-Need to finish up libpixman to the point where there X server can use
-it in place of its original copy of all this code (eg. in fb).  This
-means merging features that have happened in either tree since the
-birth of libpixman. Off-hand I can think of the following things that
-have happened:
-
-	* libpixman has fix for transform + repeat
-	* X server has some (MMX? SSE?) optimized compositing code
-
-But see the logs for more details.
diff --git a/pixman/autogen.sh b/pixman/autogen.sh
deleted file mode 100755
index fe847d9..0000000
--- a/pixman/autogen.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-set -e
-
-LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
-LIBTOOLIZE_FLAGS="--copy --force"
-ACLOCAL=${ACLOCAL-aclocal}
-AUTOHEADER=${AUTOHEADER-autoheader}
-AUTOMAKE=${AUTOMAKE-automake}
-AUTOMAKE_FLAGS="--add-missing"
-AUTOCONF=${AUTOCONF-autoconf}
-
-ARGV0=$0
-
-if test -z "$ACLOCAL_FLAGS"; then
-    acdir=`aclocal --print-ac-dir`
-    if [ ! -f $acdir/pkg.m4 ]; then
-	echo "$ARGV0: Error: Could not find pkg-config macros."
-	echo "        (Looked in $acdir/pkg.m4)"
-	echo "        If pkg.m4 is available in /another/directory, please set"
-	echo "        ACLOCAL_FLAGS=\"-I /another/directory\""
-	echo "        Otherwise, please install pkg-config."
-	echo ""
-	echo "pkg-config is available from:"
-	echo "http://www.freedesktop.org/software/pkgconfig/"
-	exit 1
-    fi
-fi
-
-if test -z "$*"; then
-  echo "$ARGV0:	Note: \`./configure' will be run with no arguments."
-  echo "		If you wish to pass any to it, please specify them on the"
-  echo "		\`$0' command line."
-  echo
-fi
-
-do_cmd() {
-    echo "$ARGV0: running \`$@'"
-    $@
-}
-
-do_cmd $LIBTOOLIZE $LIBTOOLIZE_FLAGS
-
-do_cmd $ACLOCAL $ACLOCAL_FLAGS
-
-do_cmd $AUTOHEADER
-
-do_cmd $AUTOMAKE $AUTOMAKE_FLAGS
-
-do_cmd $AUTOCONF
-
-do_cmd ./configure --enable-maintainer-mode ${1+"$@"} && echo "Now type \`make' to compile" || exit 1
diff --git a/pixman/configure.in b/pixman/configure.in
deleted file mode 100644
index 4cbb5ba..0000000
--- a/pixman/configure.in
+++ /dev/null
@@ -1,92 +0,0 @@
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.54)
-
-AC_INIT(src/pixman.h)
-
-dnl ===========================================================================
-
-# Package version number, (as distinct from shared library version)
-LIBPIXMAN_VERSION=0.1.6-head
-
-# libtool shared library version
-
-# Increment if the interface has additions, changes, removals.
-LT_CURRENT=1
-
-# Increment any time the source changes; set to
-# 0 if you increment CURRENT
-LT_REVISION=0
-
-# Increment if any interfaces have been added; set to 0
-# if any interfaces have been removed. removal has
-# precedence over adding, so set to 0 if both happened.
-LT_AGE=0
-
-VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
-AC_SUBST(VERSION_INFO)
-
-dnl ===========================================================================
-
-AM_INIT_AUTOMAKE(libpixman, $LIBPIXMAN_VERSION)
-AM_CONFIG_HEADER(config.h)
-
-AM_MAINTAINER_MODE
-
-AC_PROG_CC
-AM_PROG_LIBTOOL
-
-AC_C_BIGENDIAN
-
-dnl Use lots of warning flags with GCC
-
-WARN_CFLAGS=""
-
-if test "x$GCC" = "xyes"; then
-	WARN_CFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes \
-	-Wmissing-prototypes -Wmissing-declarations \
-	-Wnested-externs -fno-strict-aliasing \
-	-Wno-attributes"
-fi
-
-AC_SUBST(WARN_CFLAGS)
-
-dnl ===========================================================================
-dnl Check for MMX
-
-MMX_CFLAGS="-mmmx -msse -Winline --param inline-unit-growth=10000 --param large-function-growth=10000"
-
-have_mmx_intrinsics=no
-AC_MSG_CHECKING(For MMX/SSE intrinsics in the compiler)
-xserver_save_CFLAGS=$CFLAGS
-CFLAGS="$CFLAGS $MMX_CFLAGS"
-AC_COMPILE_IFELSE([
-#if defined(__GNUC__) && (__GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4))
-#error "Need GCC >= 3.4 for MMX intrinsics"
-#endif
-#include <mmintrin.h>
-#include <xmmintrin.h>
-int main () {
-    __m64 v = _mm_cvtsi32_si64 (1);
-    v = _mm_shuffle_pi16 (v, _MM_SHUFFLE(3, 3, 3, 3));
-    return _mm_cvtsi64_si32 (v);
-}], have_mmx_intrinsics=yes)
-CFLAGS=$xserver_save_CFLAGS
-AC_MSG_RESULT($have_mmx_intrinsics)
-
-if test $have_mmx_intrinsics = yes ; then
-   AC_DEFINE(USE_MMX, 1, [use MMX compiler intrinsics])
-else
-   MMX_CFLAGS=
-fi
-AC_SUBST(MMX_CFLAGS)
-
-AM_CONDITIONAL(USE_MMX, test $have_mmx_intrinsics = yes)
-
-dnl ===========================================================================
-
-AC_OUTPUT([
-libpixman.pc
-Makefile
-src/Makefile
-])
diff --git a/pixman/libpixman.pc.in b/pixman/libpixman.pc.in
deleted file mode 100644
index 006018a..0000000
--- a/pixman/libpixman.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libpixman
-Description: Pixel manipulation library
-Version: @VERSION@
-Libs: -L${libdir} -lpixman
-Cflags: -I${includedir}
diff --git a/pixman/src/.gitignore b/pixman/src/.gitignore
deleted file mode 100644
index 1084758..0000000
--- a/pixman/src/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-Makefile
-Makefile.in
-*.gcda
-*.gcno
-*.la
-*.lo
-.libs
-.deps
-*.obj
-*.lib
-*.pdb
-*.o
-*~
diff --git a/pixman/src/Makefile.am b/pixman/src/Makefile.am
deleted file mode 100644
index 106f60b..0000000
--- a/pixman/src/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-noinst_LTLIBRARIES = libpixman.la
-
-libpixman_la_SOURCES = \
-	pixman.h \
-	pixmanint.h \
-	pixman-remap.h \
-	pixman-xserver-compat.h \
-	pixregion.c \
-	pixregionint.h \
-	fbpict.h \
-	fbpict.c \
-	icblt.c \
-	icbltone.c \
-	iccolor.c \
-	icformat.c \
-	icimage.c \
-	icimage.h \
-	icpixels.c \
-	icrect.c \
-	icrop.h \
-	icstipple.c \
-	ictrap.c \
-	ictransform.c \
-	ictri.c \
-	icutil.c \
-	fbedge.c \
-	fbedgeimp.h \
-	fbtrap.c \
-	fbcompose.c \
-	renderedge.c \
-	renderedge.h
-libpixman_la_CFLAGS = $(PIXMAN_CFLAGS)
-libpixman_la_LIBADD = $(PIXMAN_LDADD)
-
-if USE_MMX
-noinst_LTLIBRARIES += libpixman-mmx.la
-libpixman_mmx_la_SOURCES = \
-	fbmmx.c		\
-	fbmmx.h
-libpixman_mmx_la_CFLAGS = $(PIXMAN_CFLAGS)
-libpixman_mmx_la_LIBADD = $(PIXMAN_LDADD)
-libpixman_la_LIBADD += libpixman-mmx.la
-endif
-
-TESTS = check-pixmanint.sh
-EXTRA_DIST = $(TESTS)
diff --git a/pixman/src/Makefile.win32 b/pixman/src/Makefile.win32
deleted file mode 100644
index fcbe53b..0000000
--- a/pixman/src/Makefile.win32
+++ /de