[cairo-commit] 2 commits - src/cairo-win32-printing-surface.c src/cairo-win32-surface.c

[Chris Wilson]

 src/cairo-win32-printing-surface.c |    2 +-
 src/cairo-win32-surface.c          |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b3ba610ec05f863a0830a1f30ed130649fbadfbb
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Jan 25 09:09:18 2010 +0000

    win32: Trivially fix the compile error with printing.
    
    _cairo_pattern_is_opaque() now takes the extents over which the
    operation is defined so that we make exclude the clear pixels that
    surround EXTEND_NONE surfaces when determining opacity. In order to take
    full advantage of this we need to start performing an extents query on
    the operation and pass that down to the analysis...
    
    This patch however is just the quick compile fix to pass a NULL and
    restore the old behaviour.
    
    Fixes (with previous commit):
      Bug 26197 - Cairo doesn't build on windows
      http://bugs.freedesktop.org/show_bug.cgi?id=26197

diff --git a/src/cairo-win32-printing-surface.c b/src/cairo-win32-printing-surface.c
index 4b6a208..35ec614 100644
--- a/src/cairo-win32-printing-surface.c
+++ b/src/cairo-win32-printing-surface.c
@@ -263,7 +263,7 @@ _cairo_win32_printing_surface_analyze_operation (cairo_win32_surface_t *surface,
 	return analyze_surface_pattern_transparency (surface_pattern);
     }
 
-    if (_cairo_pattern_is_opaque (pattern))
+    if (_cairo_pattern_is_opaque (pattern, NULL))
 	return CAIRO_STATUS_SUCCESS;
     else
 	return CAIRO_INT_STATUS_FLATTEN_TRANSPARENCY;
commit 386ca53f280652983870316593e510cfef59c559
Author: Haakon Sporsheim <haakon.sporsheim at gmail.com>
Date:   Sun Jan 24 16:43:42 2010 +0100

    win32: Compile fix, rename render_row to render_rows.

diff --git a/src/cairo-win32-surface.c b/src/cairo-win32-surface.c
index 3f5180e..ce872f7 100644
--- a/src/cairo-win32-surface.c
+++ b/src/cairo-win32-surface.c
@@ -1886,7 +1886,7 @@ typedef struct _cairo_win32_surface_span_renderer {
 } cairo_win32_surface_span_renderer_t;
 
 static cairo_status_t
-_cairo_win32_surface_span_renderer_render_row (
+_cairo_win32_surface_span_renderer_render_rows (
     void				*abstract_renderer,
     int					 y,
     int					 height,
@@ -1990,7 +1990,7 @@ _cairo_win32_surface_create_span_renderer (cairo_operator_t	 op,
 
     renderer->base.destroy = _cairo_win32_surface_span_renderer_destroy;
     renderer->base.finish = _cairo_win32_surface_span_renderer_finish;
-    renderer->base.render_row = _cairo_win32_surface_span_renderer_render_rows;
+    renderer->base.render_rows = _cairo_win32_surface_span_renderer_render_rows;
     renderer->op = op;
     renderer->pattern = pattern;
     renderer->antialias = antialias;