diff options
| author | Yonit Halperin <yhalperi@redhat.com> | 2010-07-15 11:47:36 +0300 |
|---|---|---|
| committer | Yonit Halperin <yhalperi@redhat.com> | 2010-07-15 11:47:36 +0300 |
| commit | 39d8fec68c8f9cf6f23d241043280894e2fda393 (patch) | |
| tree | b5a9a8d98e7e4fee3fdd3990826682ce6d87773f | |
| parent | 4b9304d54ac0b9a30d9009b2e7c145d048865871 (diff) | |
| parent | cc5b59e0f32b580b85b6ec92bb03fc80fbea4498 (diff) | |
| download | spice-39d8fec68c8f9cf6f23d241043280894e2fda393.tar.gz spice-39d8fec68c8f9cf6f23d241043280894e2fda393.tar.xz spice-39d8fec68c8f9cf6f23d241043280894e2fda393.zip | |
Merge branch 'master' of git://git.freedesktop.org/git/spice/spice into spice_image
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | server/red_worker.c | 3 | ||||
| -rw-r--r-- | server/spice.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 6b70329f..26da3f0f 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ AM_PROG_CC_C_O AC_C_BIGENDIAN AC_PATH_PROGS(PYTHON, python2 python) -SPICE_LT_VERSION=m4_format("%d:%d:%d", 1, 0, 0) +SPICE_LT_VERSION=m4_format("%d:%d:%d", 1, 0, 1) AC_SUBST(SPICE_LT_VERSION) # Check for the CPU we are using diff --git a/server/red_worker.c b/server/red_worker.c index ce2c65d9..bfb45607 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -5676,7 +5676,6 @@ static inline int red_glz_compress_image(DisplayChannel *display_channel, LzImageType type = MAP_BITMAP_FMT_TO_LZ_IMAGE_TYPE[src->format]; RedGlzDrawable *glz_drawable; GlzDrawableInstanceItem *glz_drawable_instance; - uint8_t *lines; int glz_size; int zlib_size; @@ -5700,7 +5699,7 @@ static inline int red_glz_compress_image(DisplayChannel *display_channel, glz_data->usr.more_lines = glz_usr_more_lines; glz_size = glz_encode(display_channel->glz, type, src->x, src->y, - (src->flags & SPICE_BITMAP_FLAGS_TOP_DOWN), lines, 0, + (src->flags & SPICE_BITMAP_FLAGS_TOP_DOWN), NULL, 0, src->stride, (uint8_t*)glz_data->data.bufs_head->buf, sizeof(glz_data->data.bufs_head->buf), glz_drawable_instance, diff --git a/server/spice.h b/server/spice.h index 2cb8a752..fc7d5b5b 100644 --- a/server/spice.h +++ b/server/spice.h @@ -21,6 +21,8 @@ #include <stdint.h> #include <sys/socket.h> +#define SPICE_SERVER_VERSION 0x000503 /* release 0.5.3 */ + /* interface base type */ typedef struct SpiceBaseInterface SpiceBaseInterface; |