[cairo-commit] 2 commits - src/cairo-debug.c src/cairo-pattern.c src/cairo-surface-observer.c

[Andrea Canciani]

 src/cairo-debug.c            |    2 +-
 src/cairo-pattern.c          |    2 +-
 src/cairo-surface-observer.c |    2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit a69e5af9cd62d1e8d9f503a9d74338a49e31f9cd
Author: Ed Schouten <ed at nuxi.nl>
Date:   Sun Sep 4 08:41:27 2016 +0200

    Write debugging information to the debugging file
    
    Some debugging functions wrote to stdout, which is inconsistent with
    the other debugging functions of the same groups.
    
    Instead they should write to the debugging file that they are given as
    input.
    
    Reviewed-by: Andrea Canciani <ranma42 at gmail.com>
    
    Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=95227

diff --git a/src/cairo-debug.c b/src/cairo-debug.c
index 1f32b19..10933a6 100644
--- a/src/cairo-debug.c
+++ b/src/cairo-debug.c
@@ -262,7 +262,7 @@ _cairo_debug_print_path (FILE *stream, const cairo_path_fixed_t *path)
 		 box.p1.x, box.p1.y, box.p2.x, box.p2.y);
     }
 
-    printf ("\n");
+    fprintf (stream, "\n");
 }
 
 void
diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c
index 1f39c7b..d3796e6 100644
--- a/src/cairo-pattern.c
+++ b/src/cairo-pattern.c
@@ -4653,7 +4653,7 @@ static void
 _cairo_debug_print_raster_source_pattern (FILE *file,
 					  const cairo_raster_source_pattern_t *raster)
 {
-    printf ("  content: %x, size %dx%d\n", raster->content, raster->extents.width, raster->extents.height);
+    fprintf (file, "  content: %x, size %dx%d\n", raster->content, raster->extents.width, raster->extents.height);
 }
 
 static void
commit efc40a94939a75c78474862638647bd5363d08cf
Author: Ed Schouten <ed at nuxi.nl>
Date:   Sun Sep 4 08:34:49 2016 +0200

    Prevent observer surfaces from writing to stdout
    
    Invoking cairo_surface_mark_dirty () on an observer surface would
    cause it to print debugging output to stdout.
    
    Reviewed-by: Andrea Canciani <ranma42 at gmail.com>
    
    Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=95227

diff --git a/src/cairo-surface-observer.c b/src/cairo-surface-observer.c
index 9d12fcd..89c7525 100644
--- a/src/cairo-surface-observer.c
+++ b/src/cairo-surface-observer.c
@@ -1219,8 +1219,6 @@ _cairo_surface_observer_mark_dirty (void *abstract_surface,
     cairo_surface_observer_t *surface = abstract_surface;
     cairo_status_t status;
 
-    printf ("mark-dirty (%d, %d) x (%d, %d)\n", x, y, width, height);
-
     status = CAIRO_STATUS_SUCCESS;
     if (surface->target->backend->mark_dirty_rectangle)
 	status = surface->target->backend->mark_dirty_rectangle (surface->target,