From 8baebc39b434d42884286aa481c18697de1712c8 Mon Sep 17 00:00:00 2001 From: Konstantin Demin Date: Thu, 2 Jul 2020 15:01:14 +0300 Subject: [PATCH] debian/patches: add 0001-mask-CACHED_BRUSH-when-checking-brush-style.patch. Fix regression introduced in 2.1.2. --- ...-CACHED_BRUSH-when-checking-brush-style.patch | 16 ++++++++++++++++ debian/patches/series | 1 + 2 files changed, 17 insertions(+) create mode 100644 debian/patches/0001-mask-CACHED_BRUSH-when-checking-brush-style.patch diff --git a/debian/patches/0001-mask-CACHED_BRUSH-when-checking-brush-style.patch b/debian/patches/0001-mask-CACHED_BRUSH-when-checking-brush-style.patch new file mode 100644 index 0000000..a63e3e0 --- /dev/null +++ b/debian/patches/0001-mask-CACHED_BRUSH-when-checking-brush-style.patch @@ -0,0 +1,16 @@ +From: Armin Novak +Date: Tue, 23 Jun 2020 09:24:35 +0200 +Subject: Fixed #6298: Mask CACHED_BRUSH when checking brush style + +--- a/libfreerdp/core/orders.c ++++ b/libfreerdp/core/orders.c +@@ -139,7 +139,8 @@ static BYTE get_bmf_bpp(UINT32 bmf, BOOL* pValid) + { + if (pValid) + *pValid = TRUE; +- switch (bmf) ++ /* Mask out highest bit */ ++ switch (bmf & (~CACHED_BRUSH)) + { + case 1: + return 1; diff --git a/debian/patches/series b/debian/patches/series index 3c49a1f..dc0e956 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ +0001-mask-CACHED_BRUSH-when-checking-brush-style.patch 1001_spelling-fixes.patch 2001-fake-git-revision.patch