[cairo-commit] Branch 'ps-surface' - src/cairo-ps-surface.c

Carl Worth cworth at kemper.freedesktop.org
Tue Feb 28 14:12:03 PST 2006


 src/cairo-ps-surface.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree e2855502f2f2e701b96a2a7eee4cda8c374bcbb9 (from e3017c3c8de2b90e1d3470866f9bd6cc2cd313fa)
Author: Carl Worth <cworth at cworth.org>
Date:   Tue Feb 28 14:10:36 2006 -0800

    Fix last piece of merge resolution missing from previous commit

diff --git a/src/cairo-ps-surface.c b/src/cairo-ps-surface.c
index 951e1d6..f35f823 100644
--- a/src/cairo-ps-surface.c
+++ b/src/cairo-ps-surface.c
@@ -1339,7 +1339,7 @@ _cairo_ps_surface_show_glyphs (void		   
     cairo_int_status_t status;
     cairo_path_fixed_t *path;
 
-    if (surface->mode == CAIRO_PAGINATED_MODE_ANALYZE) {
+    if (surface->paginated_mode == CAIRO_PAGINATED_MODE_ANALYZE) {
 	if (!pattern_operation_supported (op, source))
 	    return CAIRO_INT_STATUS_UNSUPPORTED;
 	return CAIRO_STATUS_SUCCESS;


More information about the cairo-commit mailing list