From 051cf9df6a729fcac37e054fd0632521e990c3ae Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 1 Nov 2004 01:00:16 +0000
Subject: fix convolution regression from revision 1.48 to 1.49

---
 src/mesa/swrast/s_copypix.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/mesa')

diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c
index bfcd9cb8f7..7454cfd2d2 100644
--- a/src/mesa/swrast/s_copypix.c
+++ b/src/mesa/swrast/s_copypix.c
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.1
+ * Version:  6.3
  *
  * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
@@ -175,8 +175,6 @@ copy_conv_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
       return;
    }
 
-   dest = tmpImage;
-
    if (changeBuffer) {
       /* choose the read buffer */
       _swrast_use_read_buffer(ctx);
@@ -191,6 +189,7 @@ copy_conv_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
                              srcy + row, rgba);
       chan_span_to_float(width, (CONST GLchan (*)[4]) rgba,
                          (GLfloat (*)[4]) dest);
+      dest += 4 * width;
    }
 
    if (changeBuffer) {
-- 
cgit v1.2.3