diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2000-10-05 16:22:22 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2000-10-05 16:22:22 +0000 |
| commit | fa849a0e1622039bf66ef2b7506669aba8d77d91 (patch) | |
| tree | 1a77a91960492847ffeba2f67e1dca867d96d159 /src/mesa/main/image.c | |
| parent | 55590ee810a493f151299d70d0defa7cbae041a2 (diff) | |
| download | external_mesa3d-fa849a0e1622039bf66ef2b7506669aba8d77d91.zip external_mesa3d-fa849a0e1622039bf66ef2b7506669aba8d77d91.tar.gz external_mesa3d-fa849a0e1622039bf66ef2b7506669aba8d77d91.tar.bz2 | |
drawing color-index image to RGB window was broken
Diffstat (limited to 'src/mesa/main/image.c')
| -rw-r--r-- | src/mesa/main/image.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c index 99cbcfa..af60908 100644 --- a/src/mesa/main/image.c +++ b/src/mesa/main/image.c @@ -1,4 +1,4 @@ -/* $Id: image.c,v 1.42 2000/09/26 20:53:53 brianp Exp $ */ +/* $Id: image.c,v 1.43 2000/10/05 16:22:22 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -2373,7 +2373,8 @@ _mesa_unpack_ubyte_color_span( GLcontext *ctx, extract_uint_indexes(n, indexes, srcFormat, srcType, source, srcPacking); - if (transferOps & IMAGE_MAP_COLOR_BIT) { + if (dstFormat == GL_COLOR_INDEX + && (transferOps & IMAGE_MAP_COLOR_BIT)) { _mesa_map_ci(ctx, n, indexes); } if (transferOps & IMAGE_SHIFT_OFFSET_BIT) { @@ -2630,7 +2631,8 @@ _mesa_unpack_float_color_span( GLcontext *ctx, extract_uint_indexes(n, indexes, srcFormat, srcType, source, srcPacking); - if (transferOps & IMAGE_MAP_COLOR_BIT) { + if (dstFormat == GL_COLOR_INDEX + && (transferOps & IMAGE_MAP_COLOR_BIT)) { _mesa_map_ci(ctx, n, indexes); } if (transferOps & IMAGE_SHIFT_OFFSET_BIT) { |