summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2000-10-05 16:23:18 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2000-10-05 16:23:18 +0000
commit88337d51098bde69fb9294a62e0612e889effcd4 (patch)
treef4bb9a428202b7b4eda36387032a7b782a0922a3
parent77a5bab1a38f62ce8b633989249fc2408ac7668c (diff)
drawing color-index image to RGB window was broken
-rw-r--r--src/mesa/main/image.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index 1d143524115..78002db9328 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -1,8 +1,8 @@
-/* $Id: image.c,v 1.35.4.1 2000/09/12 21:10:36 brianp Exp $ */
+/* $Id: image.c,v 1.35.4.2 2000/10/05 16:23:18 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 3.3
+ * Version: 3.4
*
* Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
*
@@ -2353,7 +2353,7 @@ _mesa_unpack_ubyte_color_span( GLcontext *ctx,
unpacking);
if (applyTransferOps) {
- if (ctx->Pixel.MapColorFlag) {
+ if (dstFormat == GL_COLOR_INDEX && ctx->Pixel.MapColorFlag) {
_mesa_map_ci(ctx, n, indexes);
}
if (ctx->Pixel.IndexShift || ctx->Pixel.IndexOffset) {
@@ -2622,7 +2622,7 @@ _mesa_unpack_float_color_span( GLcontext *ctx,
unpacking);
if (applyTransferOps) {
- if (ctx->Pixel.MapColorFlag) {
+ if (dstFormat == GL_COLOR_INDEX && ctx->Pixel.MapColorFlag) {
_mesa_map_ci(ctx, n, indexes);
}
if (ctx->Pixel.IndexShift || ctx->Pixel.IndexOffset) {