diff options
| author | Matteo F. Vescovi <mfvescovi+gitlab@gmail.com> | 2020-07-14 00:04:47 +0300 |
|---|---|---|
| committer | Matteo F. Vescovi <mfvescovi+gitlab@gmail.com> | 2020-07-14 00:04:47 +0300 |
| commit | 7479de0bb37ad7adc5f6c6b5dee9bfb1db2f7c5d (patch) | |
| tree | c0355ae1ce08de5c77b2f273ab0f821f612c189f | |
| parent | 06f3116286d0d42b307a88121bb24a5da07d70e9 (diff) | |
debian/patches/: patchset updated
- 0003-Fixed-6298-Mask-CACHED_BRUSH-when-checking-brush-sty.patch added
| -rw-r--r-- | debian/patches/0003-Fixed-6298-Mask-CACHED_BRUSH-when-checking-brush-sty.patch | 28 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/debian/patches/0003-Fixed-6298-Mask-CACHED_BRUSH-when-checking-brush-sty.patch b/debian/patches/0003-Fixed-6298-Mask-CACHED_BRUSH-when-checking-brush-sty.patch new file mode 100644 index 0000000..b56c3af --- /dev/null +++ b/debian/patches/0003-Fixed-6298-Mask-CACHED_BRUSH-when-checking-brush-sty.patch @@ -0,0 +1,28 @@ +From 62530e2d9dab999d1c5ddd1368d67c599dccd580 Mon Sep 17 00:00:00 2001 +From: Armin Novak <armin.novak@thincast.com> +Date: Tue, 23 Jun 2020 09:24:35 +0200 +Subject: [PATCH 03/34] Fixed #6298: Mask CACHED_BRUSH when checking brush + style + +(cherry picked from commit ce1a9d8d1969ecbb4d24b9f4812654638a44abc2) +--- + libfreerdp/core/orders.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libfreerdp/core/orders.c b/libfreerdp/core/orders.c +index dc4e51a87..537e69426 100644 +--- 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; +-- +2.25.4 + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..ffdd41c --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0003-Fixed-6298-Mask-CACHED_BRUSH-when-checking-brush-sty.patch |