Relay-Version: version B 2.10 5/3/83; site utzoo.UUCP
Path: utzoo!mnetor!uunet!husc6!mit-eddie!ll-xn!ames!ucbcad!ucbvax!ZERMATT.LCS.MIT.EDU!RWS
From: RWS@ZERMATT.LCS.MIT.EDU (Robert Scheifler)
Newsgroups: comp.windows.x
Subject: V11R1 fix to AllocColor for TrueColor
Message-ID: <871003145524.0.RWS@KILLINGTON.LCS.MIT.EDU>
Date: Sat, 3-Oct-87 14:55:00 EDT
Article-I.D.: KILLINGT.871003145524.0.RWS
Posted: Sat Oct  3 14:55:00 1987
Date-Received: Wed, 7-Oct-87 02:21:58 EDT
Sender: usenet@ucbvax.BERKELEY.EDU
Distribution: world
Organization: The ARPA Internet
Lines: 40

AllocColor in server/dix/colormap.c, for a TrueColor map,
was retaining garbage bits of pPix.


*** /tmp/,RCSt1020769	Sat Oct  3 14:50:44 1987
--- colormap.c	Sat Oct  3 14:50:18 1987
***************
*** 22,28 ****
  
  ******************************************************************/
  
! /* $Header: colormap.c,v 1.53 87/10/03 12:52:36 rws Exp $ */
  
  #include "X.h"
  #define NEED_EVENTS
--- 22,28 ----
  
  ******************************************************************/
  
! /* $Header: colormap.c,v 1.54 87/10/03 14:49:02 rws Exp $ */
  
  #include "X.h"
  #define NEED_EVENTS
***************
*** 728,734 ****
      case TrueColor:
  	/* Look up each component in its own map, then OR them together */
  	pixel = FindBestPixel(pmap->red, entries, &rgb, REDMAP);
! 	*pPix |= pixel << pVisual->offsetRed;
  	pixel = FindBestPixel(pmap->green, entries, &rgb, GREENMAP);
  	*pPix |= pixel << pVisual->offsetGreen;
  	pixel = FindBestPixel(pmap->blue, entries, &rgb, BLUEMAP);
--- 728,734 ----
      case TrueColor:
  	/* Look up each component in its own map, then OR them together */
  	pixel = FindBestPixel(pmap->red, entries, &rgb, REDMAP);
! 	*pPix = pixel << pVisual->offsetRed;
  	pixel = FindBestPixel(pmap->green, entries, &rgb, GREENMAP);
  	*pPix |= pixel << pVisual->offsetGreen;
  	pixel = FindBestPixel(pmap->blue, entries, &rgb, BLUEMAP);