[cairo-commit] 2 commits - src/cairo-win32-printing-surface.c test/pthread-same-source.c test/pthread-show-text.c test/pthread-similar.c

[Chris Wilson]

 src/cairo-win32-printing-surface.c |    2 +-
 test/pthread-same-source.c         |    2 --
 test/pthread-show-text.c           |    2 --
 test/pthread-similar.c             |    2 --
 4 files changed, 1 insertion(+), 7 deletions(-)

New commits:
commit fb53d05a69d0291fe68dfe8669b5c1f7636ede1a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed May 12 20:06:34 2010 +0100

    test: Remove pthread_yield()
    
    I accidentally pushed this debugging left-over from when I was tracking
    down a race in memfault. Remove it so that the test suite compiles on
    more minimal pthread setups.

diff --git a/test/pthread-same-source.c b/test/pthread-same-source.c
index 10ea283..d55debc 100644
--- a/test/pthread-same-source.c
+++ b/test/pthread-same-source.c
@@ -144,8 +144,6 @@ draw (cairo_t *cr, int width, int height)
     cairo_set_source_rgb (cr, 0.5, 0.5, 0.5);
     cairo_paint (cr);
 
-    pthread_yield ();
-
     for (i = 0; i < N_THREADS; i++) {
 	void *surface;
 
diff --git a/test/pthread-show-text.c b/test/pthread-show-text.c
index b6be8dc..0e070b7 100644
--- a/test/pthread-show-text.c
+++ b/test/pthread-show-text.c
@@ -114,8 +114,6 @@ draw (cairo_t *cr, int width, int height)
     cairo_set_source_rgb (cr, 0.5, 0.5, 0.5);
     cairo_paint (cr);
 
-    pthread_yield ();
-
     for (i = 0; i < N_THREADS; i++) {
 	void *surface;
 
diff --git a/test/pthread-similar.c b/test/pthread-similar.c
index 9d33b15..ce801ff 100644
--- a/test/pthread-similar.c
+++ b/test/pthread-similar.c
@@ -77,8 +77,6 @@ draw (cairo_t *cr, int width, int height)
         }
     }
 
-    pthread_yield ();
-
     for (i = 0; i < N_THREADS; i++) {
 	void *surface;
 
commit cdd98dba6a62360071aebb6dbbb6be2ab6be368f
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed May 12 19:35:15 2010 +0100

    win32-printing: compile fix.
    
    Missing arg for _cairo_recording_surface_replay_region().

diff --git a/src/cairo-win32-printing-surface.c b/src/cairo-win32-printing-surface.c
index 2b51a4d..d6868b2 100644
--- a/src/cairo-win32-printing-surface.c
+++ b/src/cairo-win32-printing-surface.c
@@ -497,7 +497,7 @@ _cairo_win32_printing_surface_paint_recording_pattern (cairo_win32_surface_t   *
 	    SelectClipPath (surface->dc, RGN_AND);
 
 	    SaveDC (surface->dc); /* Allow clip path to be reset during replay */
-	    status = _cairo_recording_surface_replay_region (&recording_surface->base,
+	    status = _cairo_recording_surface_replay_region (&recording_surface->base, NULL,
 							     &surface->base,
 							     CAIRO_RECORDING_REGION_NATIVE);
 	    assert (status != CAIRO_INT_STATUS_UNSUPPORTED);