summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2002-04-04 16:53:00 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2002-04-04 16:53:00 +0000
commit543381510d942246020dfe5f71748539fed0d290 (patch)
tree3082bb44208c14a7032e6048435106b68ad15170
parent1d84421b7e29079e25689185edcff62e7ba42e0a (diff)
fixed 16/32-bit channel problems in CopyColor[Sub]Table()
-rw-r--r--src/mesa/swrast/s_imaging.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/swrast/s_imaging.c b/src/mesa/swrast/s_imaging.c
index 56cf9ca7ed..1c63f5c341 100644
--- a/src/mesa/swrast/s_imaging.c
+++ b/src/mesa/swrast/s_imaging.c
@@ -1,10 +1,10 @@
-/* $Id: s_imaging.c,v 1.4 2001/03/19 02:28:59 keithw Exp $ */
+/* $Id: s_imaging.c,v 1.5 2002/04/04 16:53:00 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 3.5
+ * Version: 4.1
*
- * Copyright (C) 1999-2001 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -54,7 +54,7 @@ _swrast_CopyColorTable( GLcontext *ctx,
(*swrast->Driver.SetReadBuffer)( ctx, ctx->DrawBuffer,
ctx->Color.DriverDrawBuffer );
- glColorTable(target, internalformat, width, GL_RGBA, GL_UNSIGNED_BYTE, data);
+ glColorTable(target, internalformat, width, GL_RGBA, CHAN_TYPE, data);
}
void
@@ -78,7 +78,7 @@ _swrast_CopyColorSubTable( GLcontext *ctx,GLenum target, GLsizei start,
(*swrast->Driver.SetReadBuffer)( ctx, ctx->DrawBuffer,
ctx->Color.DriverDrawBuffer );
- glColorSubTable(target, start, width, GL_RGBA, GL_UNSIGNED_BYTE, data);
+ glColorSubTable(target, start, width, GL_RGBA, CHAN_TYPE, data);
}