summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlon Levy <alevy@redhat.com>2012-05-15 12:40:07 +0300
committerAlon Levy <alevy@redhat.com>2012-05-15 19:24:47 +0300
commit313e775f4ce248170c3474662715df91f5631214 (patch)
tree8526244030416e759d7eb66c33a9326c2fc13c24
parent7c258a992fd175c95f774e9c021da5a00c53a690 (diff)
downloadspice-313e775f4ce248170c3474662715df91f5631214.tar.gz
spice-313e775f4ce248170c3474662715df91f5631214.tar.xz
spice-313e775f4ce248170c3474662715df91f5631214.zip
server/red_worker/red_handle_self_bitmap: add red_drawable local, one extra whitespace line removed
(cherry picked from commit c6bb40947febf651706a0cd804bb2a8096574ea7)
-rw-r--r--server/red_worker.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/server/red_worker.c b/server/red_worker.c
index cdad131b..3e8e1869 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -3560,20 +3560,20 @@ static inline int red_handle_self_bitmap(RedWorker *worker, Drawable *drawable)
RedSurface *surface;
int bpp;
int all_set;
+ RedDrawable *red_drawable = drawable->red_drawable;
- if (!drawable->red_drawable->self_bitmap) {
+ if (!red_drawable->self_bitmap) {
return TRUE;
}
-
surface = &worker->surfaces[drawable->surface_id];
bpp = SPICE_SURFACE_FMT_DEPTH(surface->context.format) / 8;
- width = drawable->red_drawable->self_bitmap_area.right
- - drawable->red_drawable->self_bitmap_area.left;
- height = drawable->red_drawable->self_bitmap_area.bottom
- - drawable->red_drawable->self_bitmap_area.top;
+ width = red_drawable->self_bitmap_area.right
+ - red_drawable->self_bitmap_area.left;
+ height = red_drawable->self_bitmap_area.bottom
+ - red_drawable->self_bitmap_area.top;
dest_stride = SPICE_ALIGN(width * bpp, 4);
image = spice_new0(SpiceImage, 1);
@@ -3593,7 +3593,7 @@ static inline int red_handle_self_bitmap(RedWorker *worker, Drawable *drawable)
image->u.bitmap.data->flags |= SPICE_CHUNKS_FLAGS_FREE;
red_get_area(worker, drawable->surface_id,
- &drawable->red_drawable->self_bitmap_area, dest, dest_stride, TRUE);
+ &red_drawable->self_bitmap_area, dest, dest_stride, TRUE);
/* For 32bit non-primary surfaces we need to keep any non-zero
high bytes as the surface may be used as source to an alpha_blend */