cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

games/edge: Fix build with libc++ 3.8.0

Browse Source 
- Replace abs() on unsigned arguments in games/edge

PR:		208757
Submitted by:	dim
This commit is contained in:
Kurt Jaeger 2016-04-18 05:28:35 +00:00
parent fc089a0213
commit 61d69ef66b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=413549
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
games/edge/files/patch-epi__image_hq2x.cc Normal file
View File

@ -0,0 +1,26 @@
--- epi/image_hq2x.cc.orig 2009-10-18 12:33:23.000000000 +0200
+++ epi/image_hq2x.cc 2016-04-12 22:06:00.628879000 +0200
@@ -169,15 +169,20 @@ void Interp10(u8_t * dest, u32_t c1, u32
#define PIXEL11_90 Interp9(dest+BpL+4, c[5], c[6], c[8]);
#define PIXEL11_100 Interp10(dest+BpL+4, c[5], c[6], c[8]);
+static inline u32_t UDiff(u32_t u1, u32_t u2)
+{
+ return (u1 >= u2) ? u1 - u2 : u2 - u1;
+}
+
inline bool Diff(const u8_t p1, const u8_t p2)
{
u32_t YUV1 = PixelYUV[p1];
u32_t YUV2 = PixelYUV[p2];
return (YUV1 & Amask) != (YUV2 & Amask) ||
- (u32_t)abs((YUV1 & Ymask) - (YUV2 & Ymask)) > trY ||
- (u32_t)abs((YUV1 & Umask) - (YUV2 & Umask)) > trU ||
- (u32_t)abs((YUV1 & Vmask) - (YUV2 & Vmask)) > trV;
+ UDiff((YUV1 & Ymask), (YUV2 & Ymask)) > trY ||
+ UDiff((YUV1 & Umask), (YUV2 & Umask)) > trU ||
+ UDiff((YUV1 & Vmask), (YUV2 & Vmask)) > trV;
}
void Setup(const u8_t *palette, int trans_pixel)