gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

net-misc/freerdp: backport another ppc fix

Browse Source 
Closes: https://bugs.gentoo.org/672744
Package-Manager: Portage-2.3.76_p10, Repoman-2.3.17_p62
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
This commit is contained in:
Mike Gilbert
2019-10-07 13:17:51 -04:00
parent 0aee648f7e
commit e800eb711b
2 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
net-misc/freerdp/files/2.0.0-rc4-bitmap-endian.patch Normal file
View File

@@ -0,0 +1,30 @@
From 18b193a1cf083b92279c3952f4f907a07cd92834 Mon Sep 17 00:00:00 2001
From: Armin Novak <armin.novak@thincast.com>
Date: Wed, 13 Feb 2019 09:30:34 +0100
Subject: [PATCH] Fixed endianess issue with GETPIXEL16 and GETPIXEL32
---
libfreerdp/codec/bitmap.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libfreerdp/codec/bitmap.c b/libfreerdp/codec/bitmap.c
index 7524bb99ce..479c965e52 100644
--- a/libfreerdp/codec/bitmap.c
+++ b/libfreerdp/codec/bitmap.c
@@ -26,12 +26,14 @@
static INLINE UINT16 GETPIXEL16(const void* d, UINT32 x, UINT32 y, UINT32 w)
{
- return (*(((const unsigned short*)d) + ((y) * (w) + (x))));
+ const BYTE* src = (const BYTE*)d + ((y * w + x) * sizeof(UINT16));
+ return (UINT16)(((UINT16)src[1] << 8) | (UINT16)src[0]);
}
static INLINE UINT32 GETPIXEL32(const void* d, UINT32 x, UINT32 y, UINT32 w)
{
- return (*(((const unsigned int*)d) + ((y) * (w) + (x))));
+ const BYTE* src = (const BYTE*)d + ((y * w + x) * sizeof(UINT32));
+ return (((UINT32)src[3]) << 24) | (((UINT32)src[2]) << 16) | (((UINT32)src[1]) << 8) | (src[0] & 0xFF);
}
/*****************************************************************************/

1
net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
View File

@@ -90,6 +90,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/2.0.0-rc4-libressl.patch
"${FILESDIR}"/2.0.0-rc4-bitmap-endian.patch
"${DISTDIR}"/freerdp-2.0.0-rc4-fix-NTLM-AvPair-lists.patch
)