summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudio Ciccani <klan@users.sourceforge.net>2006-07-08 10:02:47 +0000
committerClaudio Ciccani <klan@users.sourceforge.net>2006-07-08 10:02:47 +0000
commitfa4f850c33686eba30570796f77dfbf37acf2972 (patch)
treecc02000cb5f31aff4da8ef7e4c7f60137f7ea918
parent9b94eb8b51f19403fa9bb7d086de1dc89802e903 (diff)
downloadxine-lib-fa4f850c33686eba30570796f77dfbf37acf2972.tar.gz
xine-lib-fa4f850c33686eba30570796f77dfbf37acf2972.tar.bz2
Avoid negative overflow in BLEND_COLOR().
CVS patchset: 8094 CVS date: 2006/07/08 10:02:47
-rw-r--r--src/xine-engine/alphablend.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xine-engine/alphablend.c b/src/xine-engine/alphablend.c
index 3eafc6ac3..425bbd162 100644
--- a/src/xine-engine/alphablend.c
+++ b/src/xine-engine/alphablend.c
@@ -38,7 +38,7 @@
#include "bswap.h"
-#define BLEND_COLOR(dst, src, mask, o) ((((((src&mask)-(dst&mask))*(o*0x1111+1))>>16)+(dst&mask))&mask)
+#define BLEND_COLOR(dst, src, mask, o) ((((((src&mask)-(dst&mask))*(o*0x111+1))>>12)+(dst&mask))&mask)
#define BLEND_BYTE(dst, src, o) (((((src)-(dst))*(o*0x1111+1))>>16)+(dst))