From: Karl Schultz <kschultz@freedesktop.org>
Date: Tue, 28 Sep 2004 18:53:44 +0000 (+0000)
Subject: Fix bug in glDrawPixels when writing color indexed images on color indexed
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fa569c0a73576d3cca7cd1d0363064be099a6a22;p=mesa.git

Fix bug in glDrawPixels when writing color indexed images on color indexed
devices.  In draw_index_pixels(), use the correct variables for the span Y
and span end values.
---

diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c
index 510261f7199..141054c2f66 100644
--- a/src/mesa/swrast/s_drawpix.c
+++ b/src/mesa/swrast/s_drawpix.c
@@ -521,12 +521,12 @@ draw_index_pixels( GLcontext *ctx, GLint x, GLint y,
       const GLint spanEnd = (width - skipPixels > MAX_WIDTH)
                           ? MAX_WIDTH : (width - skipPixels);
       ASSERT(spanEnd <= MAX_WIDTH);
-      for (row = 0; row < height; row++, span.y++) {
+      for (row = 0; row < height; row++, spanY++) {
          const GLvoid *source = _mesa_image_address(unpack, pixels,
                                                     width, height,
                                                     GL_COLOR_INDEX, type,
                                                     0, row, skipPixels);
-         _mesa_unpack_index_span(ctx, span.end, GL_UNSIGNED_INT,
+         _mesa_unpack_index_span(ctx, spanEnd, GL_UNSIGNED_INT,
                                  span.array->index, type, source, unpack,
                                  ctx->_ImageTransferState);