[Spice-commits] common/canvas_base.c common/gdi_canvas.c common/gl_canvas.c server/red_parse_qxl.c server/red_worker.c

Alexander Larsson alexl at kemper.freedesktop.org
Thu Jul 1 07:07:21 PDT 2010


 common/canvas_base.c   |    2 +-
 common/gdi_canvas.c    |    2 +-
 common/gl_canvas.c     |    2 +-
 server/red_parse_qxl.c |    2 +-
 server/red_worker.c    |    4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 007d12897362572809dfe523fa30b373c31a28fa
Author: Alexander Larsson <alexl at redhat.com>
Date:   Thu Jul 1 16:07:02 2010 +0200

    Update for the SpicePath.segments type change

diff --git a/common/canvas_base.c b/common/canvas_base.c
index b8a42e6..866b4e6 100644
--- a/common/canvas_base.c
+++ b/common/canvas_base.c
@@ -3180,7 +3180,7 @@ static void canvas_draw_stroke(SpiceCanvas *spice_canvas, SpiceRect *bbox,
         CANVAS_ERROR("invalid brush type");
     }
 
-    seg = stroke->path->segments;
+    seg = (SpicePathSeg*)stroke->path->segments;
 
     stroke_lines_init(&lines);
 
diff --git a/common/gdi_canvas.c b/common/gdi_canvas.c
index c5c7462..52ae0a6 100644
--- a/common/gdi_canvas.c
+++ b/common/gdi_canvas.c
@@ -310,7 +310,7 @@ uint32_t raster_ops[] = {
 
 static void set_path(GdiCanvas *canvas, SpicePath *s)
 {
-    SpicePathSeg* seg = s->segments;
+    SpicePathSeg* seg = (SpicePathSeg*)s->segments;
     int i;
 
     for (i = 0; i < s->num_segments; i++) {
diff --git a/common/gl_canvas.c b/common/gl_canvas.c
index 10745b4..3e02a25 100644
--- a/common/gl_canvas.c
+++ b/common/gl_canvas.c
@@ -115,7 +115,7 @@ static GLCPath get_path(GLCanvas *canvas, SpicePath *s)
 {
     GLCPath path = glc_path_create(canvas->glc);
     int i;
-    SpicePathSeg* seg = s->segments;
+    SpicePathSeg* seg = (SpicePathSeg*)s->segments;
 
     for (i = 0; i < s->num_segments; i++) {
         uint32_t flags = seg->flags;
diff --git a/server/red_parse_qxl.c b/server/red_parse_qxl.c
index 7e87776..3530de1 100644
--- a/server/red_parse_qxl.c
+++ b/server/red_parse_qxl.c
@@ -182,7 +182,7 @@ static SpicePath *red_get_path(RedMemSlotInfo *slots, int group_id,
 
     start = (QXLPathSeg*)data;
     end = (QXLPathSeg*)(data + size);
-    seg = red->segments;
+    seg = (SpicePathSeg*)red->segments;
     n_segments = 0;
     mem_size2 = sizeof(*red);
     while (start < end) {
diff --git a/server/red_worker.c b/server/red_worker.c
index 6ab4b3b..ee81fcf 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -2296,8 +2296,8 @@ static int is_equal_path(RedWorker *worker, SpicePath *path1, SpicePath *path2)
     if (path1->num_segments != path2->num_segments)
         return FALSE;
 
-    seg1 = &path1->segments[0];
-    seg2 = &path2->segments[0];
+    seg1 = (SpicePathSeg*)&path1->segments[0];
+    seg2 = (SpicePathSeg*)&path2->segments[0];
     for (i = 0; i < path1->num_segments; i++) {
         if (seg1->flags != seg2->flags ||
             seg1->count != seg2->count) {


More information about the Spice-commits mailing list