From 71360eb1c269708221bafcdfdc7ee2b1409f9fd5 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jan 25 2018 09:29:32 +0000
Subject: import spice-gtk-0.33-6.el7_4.1


---

diff --git a/SOURCES/0015-canvas-base-Fix-width-computation-for-palette-images.patch b/SOURCES/0015-canvas-base-Fix-width-computation-for-palette-images.patch
new file mode 100644
index 0000000..350839c
--- /dev/null
+++ b/SOURCES/0015-canvas-base-Fix-width-computation-for-palette-images.patch
@@ -0,0 +1,33 @@
+From 3b4759ce15325e2de1b473d619b69ae786c2fcec Mon Sep 17 00:00:00 2001
+From: Frediano Ziglio <fziglio@redhat.com>
+Date: Thu, 21 Dec 2017 15:54:04 +0000
+Subject: [PATCH spice-common] canvas-base: Fix width computation for palette
+ images
+
+Palette images are encoded with a slightly larger pixel than
+width. This cause a wrong calculation of stride_encoded value
+which cause a wrong stride adjustment.
+
+This fix bug https://bugzilla.redhat.com/show_bug.cgi?id=1508847.
+
+Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
+---
+ common/canvas_base.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/common/canvas_base.c b/common/canvas_base.c
+index a9d7855..2ecd276 100644
+--- a/spice-common/common/canvas_base.c
++++ b/spice-common/common/canvas_base.c
+@@ -824,7 +824,7 @@ static pixman_image_t *canvas_get_lz(CanvasBase *canvas, SpiceImage *image,
+     lz_decode_begin(lz_data->lz, comp_buf, comp_size, &type,
+                     &width, &height, &n_comp_pixels, &top_down, palette);
+ 
+-    stride_encoded = width;
++    stride_encoded = n_comp_pixels / height;
+     switch (type) {
+     case LZ_IMAGE_TYPE_RGBA:
+         as_type = LZ_IMAGE_TYPE_RGBA;
+-- 
+2.14.3
+
diff --git a/SPECS/spice-gtk.spec b/SPECS/spice-gtk.spec
index 044adfb..0325997 100644
--- a/SPECS/spice-gtk.spec
+++ b/SPECS/spice-gtk.spec
@@ -10,7 +10,7 @@
 
 Name:           spice-gtk
 Version:        0.33
-Release:        6%{?dist}
+Release:        6%{?dist}.1
 Summary:        A GTK+ widget for SPICE clients
 
 Group:          System Environment/Libraries
@@ -33,6 +33,7 @@ Patch0011:      0011-Remove-redundant-space-from-error-message.patch
 Patch0012:      0012-audio-debug-audio-codec-when-audio-stream-starts.patch
 Patch0013:      0013-file-xfer-Fix-bad-filename-encoding.patch
 Patch0014:      0014-Revert-Ignore-modifiers-messages-if-no-modifiers-cha.patch
+Patch0015:      0015-canvas-base-Fix-width-computation-for-palette-images.patch
 Patch1000:      1000-gtk-Makefile.am-add-PIE-flags-to-libspice-client-gli.patch
 
 BuildRequires: intltool
@@ -146,6 +147,7 @@ spicy-screenshot is a tool to capture screen-shots of a SPICE desktop.
 %patch0012 -p1
 %patch0013 -p1
 %patch0014 -p1
+%patch0015 -p1
 %patch1000 -p1
 find . -name '*.stamp' | xargs touch
 
@@ -224,6 +226,10 @@ rm -f %{buildroot}%{_libdir}/*.la
 %{_bindir}/spicy-stats
 
 %changelog
+* Thu Dec 21 2017 Frediano Ziglio <fziglio@redhat.com> - 0.33-6.1
+- Fix stride misalignment
+  Resolves: rhbz#1532212
+
 * Wed Jun 7 2017 Pavel Grunt <pgrunt@redhat.com> - 0.33-6
 - Fix capslock regression
   Resolves: rhbz#1458730