[Spice-commits] 2 commits - server/red_worker.c server/spice_bitmap_utils.c

[Yonit Halperin]

 server/red_worker.c         |    2 +-
 server/spice_bitmap_utils.c |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d0a1346fda20f205837c9d178a63a96a2683b38b
Author: Yonit Halperin <yhalperi at redhat.com>
Date:   Thu Aug 22 16:10:00 2013 -0400

    red_worker: fix call to dump_bitmap (too many args)

diff --git a/server/red_worker.c b/server/red_worker.c
index 7f1aeda..0c611d0 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -6629,7 +6629,7 @@ static FillBitsType fill_bits(DisplayChannelClient *dcc, SpiceMarshaller *m,
     case SPICE_IMAGE_TYPE_BITMAP: {
         SpiceBitmap *bitmap = &image.u.bitmap;
 #ifdef DUMP_BITMAP
-        dump_bitmap(display_channel->common.worker, &simage->u.bitmap, drawable->group_id);
+        dump_bitmap(&simage->u.bitmap);
 #endif
         /* Images must be added to the cache only after they are compressed
            in order to prevent starvation in the client between pixmap_cache and
commit 93b88a73f3852ed87003cbdb21fa3c5e28b3726c
Author: Yonit Halperin <yhalperi at redhat.com>
Date:   Thu Aug 22 16:09:26 2013 -0400

    spice_bitmap_utils: fix dump_bitmap

diff --git a/server/spice_bitmap_utils.c b/server/spice_bitmap_utils.c
index ce0a5ed..7b370a0 100644
--- a/server/spice_bitmap_utils.c
+++ b/server/spice_bitmap_utils.c
@@ -63,7 +63,7 @@ void dump_bitmap(SpiceBitmap *bitmap)
     int32_t tmp_32;
     uint16_t tmp_u16;
     FILE *f;
-    int i;
+    int i, j;
 
     switch (bitmap->format) {
     case SPICE_BITMAP_FMT_1BIT_BE:
@@ -159,8 +159,8 @@ void dump_bitmap(SpiceBitmap *bitmap)
     for (i = 0; i < bitmap->data->num_chunks; i++) {
         SpiceChunk *chunk = &bitmap->data->chunk[i];
         int num_lines = chunk->len / bitmap->stride;
-        for (i = 0; i < num_lines; i++) {
-            dump_line(f, chunk->data + (i * bitmap->stride), n_pixel_bits, bitmap->x, row_size);
+        for (j = 0; j < num_lines; j++) {
+            dump_line(f, chunk->data + (j * bitmap->stride), n_pixel_bits, bitmap->x, row_size);
         }
     }
     fclose(f);