summaryrefslogtreecommitdiff
path: root/src/mesa/main/colortab.c
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2000-04-11 20:54:49 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2000-04-11 20:54:49 +0000
commit67c01f5f67cf93dc882cbe5b783acad9f8fc338f (patch)
tree66bc87c1bb4ca84fb7554b8922d3d09ae0f4d2fe /src/mesa/main/colortab.c
parentce8e1a4f13c93679ac44233cc5eae17d12a3f8c4 (diff)
fixed duplicate variable problem
Diffstat (limited to 'src/mesa/main/colortab.c')
-rw-r--r--src/mesa/main/colortab.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index f456b691cc..67456f5d10 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) {