aboutsummaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorHans-Christoph Steiner <eighthave@users.sourceforge.net>2010-09-09 01:07:07 +0000
committerHans-Christoph Steiner <eighthave@users.sourceforge.net>2010-09-09 01:07:07 +0000
commit2611648f52e2fb33c77d9eeefe5996c235579272 (patch)
tree3849adc7c34d9c4245ff2fb94c4d36d0bfaea26a /system
parentcde22b2680737c879af172914e7819ebab925234 (diff)
after off-list discussion with Tom Schouten, committing John Harrison's patch #3050325
svn path=/trunk/externals/pdp/; revision=14003
Diffstat (limited to 'system')
-rw-r--r--system/image/pdp_imageproc_mmx.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/system/image/pdp_imageproc_mmx.c b/system/image/pdp_imageproc_mmx.c
index cf42d67..dee5dac 100644
--- a/system/image/pdp_imageproc_mmx.c
+++ b/system/image/pdp_imageproc_mmx.c
@@ -74,8 +74,15 @@ void pdp_imageproc_mix_setrightgain(void *x, float gain){setvec((s16 *)x + 4, ga
void pdp_imageproc_mix_process(void *x, u32 width, u32 height, s16 *image, s16 *image2)
{
s16 *d = (s16 *)x;
- unsigned int totalnbpixels = width * height;
- pixel_mix_s16(image, image2, totalnbpixels>>2, d, d+4);
+ u32 i;
+
+ if (*d == 0)
+ for(i=0; i<width*height; i++)
+ image[i] = image2[i];
+ else {
+ unsigned int totalnbpixels = width * height;
+ pixel_mix_s16(image, image2, totalnbpixels>>2, d, d+4);
+ }
}