From 193a74a0ab7880800b688e91106668b373f9df54 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <eighthave@users.sourceforge.net>
Date: Thu, 9 Sep 2010 01:07:24 +0000
Subject: after off-list discussion with Tom Schouten, committing John
 Harrison's patch #3050324

svn path=/trunk/externals/pdp/; revision=14004
---
 system/image/pdp_imageproc_portable.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'system/image')

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);
-    }
-	
+      }
 }
 
 
-- 
cgit v1.2.1