--- ray/src/px/vgaimage.c 1992/11/11 17:34:14 2.5 +++ ray/src/px/vgaimage.c 1993/06/11 16:58:35 2.7 @@ -1,4 +1,4 @@ -/* Copyright (c) 1992 Regents of the University of California */ +/* Copyright (c) 1993 Regents of the University of California */ #ifndef lint static char SCCSid[] = "$SunId$ LBL"; @@ -168,10 +168,10 @@ init() /* initialize and load display */ short xsiz, ysiz; } video[] = { {_MRES256COLOR, 320, 200}, - {_VRES256COLOR, 640, 400}, + {_VRES256COLOR, 640, 480}, {_SVRES256COLOR, 800, 600}, {_XRES256COLOR, 1024, 768}, - -1 + {-1, 0, 0} }; struct videoconfig config; register int i; @@ -379,7 +379,7 @@ setpalette() /* set our palette using clrtab */ cvals[ourblack] = _BLACK; cvals[ourwhite] = _BRIGHTWHITE; for (i = 0; i < maxcolors; i++) - cvals[i+minpix] = clrtab[i][BLU]<<14 & 0x3f0000L | + cvals[i+minpix] = (long)clrtab[i][BLU]<<14 & 0x3f0000L | clrtab[i][GRN]<<6 & 0x3f00 | clrtab[i][RED]>>2; _remapallpalette(cvals);