[cairo-commit] 2 commits - src/cairo-qt-surface.cpp src/cairo-script-surface.c

[GitLab Mirror]

 src/cairo-qt-surface.cpp   |    9 ++++++---
 src/cairo-script-surface.c |    2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit c4fd00c2c4111dfbf1aeb81ed04de4bf6e5efc9f
Author: Mathieu Duponchelle <mathieu at centricular.com>
Date:   Wed May 30 17:59:18 2018 +0200

    script-surface: Fix unitialized variable compiler warning
    
    gcc doesn't warn about this because status is potentially
    initialized in a loop.

diff --git a/src/cairo-script-surface.c b/src/cairo-script-surface.c
index c31900aa2..4d7778b99 100644
--- a/src/cairo-script-surface.c
+++ b/src/cairo-script-surface.c
@@ -1839,7 +1839,7 @@ _emit_path_boxes (cairo_script_surface_t *surface,
 {
     cairo_script_context_t *ctx = to_context (surface);
     cairo_path_fixed_iter_t iter;
-    cairo_status_t status;
+    cairo_status_t status = CAIRO_STATUS_SUCCESS;
     struct _cairo_boxes_chunk *chunk;
     cairo_boxes_t boxes;
     cairo_box_t box;
commit bfa00bc3d7d8754bce5f115ac2280c42e6447ba0
Author: Mathieu Duponchelle <mathieu at centricular.com>
Date:   Tue May 29 19:44:45 2018 +0200

    cairo-qt-surface: fix arguments of _cairo_surface_init()
    
    This is broken since b1192beac7c5b56a8ff356d20af5ebfb65404109 (2015!)

diff --git a/src/cairo-qt-surface.cpp b/src/cairo-qt-surface.cpp
index 5f669d8be..d276f059e 100644
--- a/src/cairo-qt-surface.cpp
+++ b/src/cairo-qt-surface.cpp
@@ -1539,7 +1539,8 @@ cairo_qt_surface_create (QPainter *painter)
     _cairo_surface_init (&qs->base,
 			 &cairo_qt_surface_backend,
 			 NULL, /* device */
-			 CAIRO_CONTENT_COLOR_ALPHA);
+			 CAIRO_CONTENT_COLOR_ALPHA,
+			 FALSE); /* is_vector */
 
     _cairo_surface_clipper_init (&qs->clipper,
 				 _cairo_qt_surface_clipper_intersect_clip_path);
@@ -1578,7 +1579,8 @@ cairo_qt_surface_create_with_qimage (cairo_format_t format,
     _cairo_surface_init (&qs->base,
 			 &cairo_qt_surface_backend,
 			 NULL, /* device */
-			 _cairo_content_from_format (format));
+			 _cairo_content_from_format (format),
+			 FALSE); /* is_vector */
 
     _cairo_surface_clipper_init (&qs->clipper,
 				 _cairo_qt_surface_clipper_intersect_clip_path);
@@ -1639,7 +1641,8 @@ cairo_qt_surface_create_with_qpixmap (cairo_content_t content,
     _cairo_surface_init (&qs->base,
 			 &cairo_qt_surface_backend,
 			 NULL, /* device */
-			 content);
+			 content,
+			 FALSE); /* is_vector */
 
     _cairo_surface_clipper_init (&qs->clipper,
 				 _cairo_qt_surface_clipper_intersect_clip_path);