From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 11 Apr 2000 20:54:49 +0000 (+0000)
Subject: fixed duplicate variable problem
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=67c01f5f67cf93dc882cbe5b783acad9f8fc338f;p=mesa.git

fixed duplicate variable problem
---

diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index f456b691ccd..67456f5d109 100644
--- a/src/mesa/main/colortab.c
+++ b/src/mesa/main/colortab.c
@@ -1,4 +1,4 @@
-/* $Id: colortab.c,v 1.11 2000/04/11 15:07:48 brianp Exp $ */
+/* $Id: colortab.c,v 1.12 2000/04/11 20:54:49 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -114,7 +114,7 @@ decode_internal_format( GLint format )
 void 
 _mesa_ColorTable( GLenum target, GLenum internalFormat,
                   GLsizei width, GLenum format, GLenum type,
-                  const GLvoid *table )
+                  const GLvoid *data )
 {
    GET_CURRENT_CONTEXT(ctx);
    struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
@@ -202,7 +202,7 @@ _mesa_ColorTable( GLenum target, GLenum internalFormat,
    if (!proxy) {
       _mesa_unpack_ubyte_color_span(ctx, width, table->Format,
                                     table->Table,  /* dest */
-                                    format, type, table,
+                                    format, type, data,
                                     &ctx->Unpack, GL_FALSE);
    }
    if (texObj) {