pixman: Branch 'master' - 3 commits

[Søren Sandmann Pedersen]

 TODO                 |    4 ++++
 pixman/pixman-pict.c |    4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
diff-tree 30f198fe53949da59821d2f394f0cecb5bdaa646 (from e71844095ea75b4f9f66c85c87b4b3b6c287e02f)
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Sun Jun 17 18:50:00 2007 -0400

    Remove accidentally committed use of TIMER_BEGIN/END

diff --git a/pixman/pixman-pict.c b/pixman/pixman-pict.c
index 3777515..201dc91 100644
--- a/pixman/pixman-pict.c
+++ b/pixman/pixman-pict.c
@@ -1089,8 +1089,6 @@ pixman_image_composite_rect  (pixman_op_
     return_if_fail (src != NULL);
     return_if_fail (dest != NULL);
     
-    TIMER_BEGIN (pixman_image_composite);
-    
     if (width > SCANLINE_BUFFER_LENGTH)
     {
 	scanline_buffer = (uint32_t *)malloc (width * 3 * sizeof (uint32_t));
@@ -1116,8 +1114,6 @@ pixman_image_composite_rect  (pixman_op_
 
     if (scanline_buffer != _scanline_buffer)
 	free (scanline_buffer);
-
-    TIMER_END (pixman_image_composite);
 }    
 
 
diff-tree e71844095ea75b4f9f66c85c87b4b3b6c287e02f (from parents)
Merge: 4f9f7ae47ad258a1605a6b38c5ec268c9ee17150 647852d714ddfe6e1d71af1f4aea0e272c459fc6
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Sun Jun 17 18:49:02 2007 -0400

    Merge branch 'master' of ssh+git://sandmann@git.freedesktop.org/git/pixman

diff-tree 4f9f7ae47ad258a1605a6b38c5ec268c9ee17150 (from ad80d4d2bc8c4e37a8266b98a2241c0ebd7f0e43)
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Sun Jun 17 18:02:06 2007 -0400

    Update TODO

diff --git a/TODO b/TODO
index 3151843..74ceee6 100644
--- a/TODO
+++ b/TODO
@@ -33,6 +33,10 @@
 - Add non-mmx solid fill
 
 - make the wrapper functions global instead of image specific
+	- this won't work since pixman is linked to both fb and wfb
+
+- restore READ/WRITE in the fbcompose combiners since they sometimes
+  store directly to destination drawables.
 
 done: