mirror of
https://gitlab.uni-freiburg.de/opensourcevdi/spice
synced 2025-12-27 07:29:32 +00:00
Merge branch 'master' of git://git.freedesktop.org/git/spice/spice into spice_image
This commit is contained in:
commit
39d8fec68c
@ -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
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user