aboutsummaryrefslogtreecommitdiff
path: root/system/image
diff options
context:
space:
mode:
authorHans-Christoph Steiner <eighthave@users.sourceforge.net>2010-09-09 01:07:24 +0000
committerHans-Christoph Steiner <eighthave@users.sourceforge.net>2010-09-09 01:07:24 +0000
commit193a74a0ab7880800b688e91106668b373f9df54 (patch)
tree1a73e9d412d3764528baf391cc146546ff729da3 /system/image
parent2611648f52e2fb33c77d9eeefe5996c235579272 (diff)
after off-list discussion with Tom Schouten, committing John Harrison's patch #3050324
svn path=/trunk/externals/pdp/; revision=14004
Diffstat (limited to 'system/image')
-rw-r--r--system/image/pdp_imageproc_portable.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/system/image/pdp_imageproc_portable.c b/system/image/pdp_imageproc_portable.c
index 3e155ee..2e2207a 100644
--- a/system/image/pdp_imageproc_portable.c
+++ b/system/image/pdp_imageproc_portable.c
@@ -89,13 +89,18 @@ void pdp_imageproc_mix_process(void *x, u32 width, u32 height, s16 *image, s16 *
u32 i;
s32 a,b;
- for(i=0; i<width*height; i++){
+
+ if (*d == 0)
+ for(i=0; i<width*height; i++){
+ image[i] = image2[i];
+ }
+ else
+ for(i=0; i<width*height; i++){
a = (s32)image[i];
b = (s32)image2[i];
a = (a*d[0] + b*d[1]) >> 15;
image[i] = (s16)CLAMP16(a);
- }
-
+ }
}