--- ray/src/px/vgaimage.c	1992/11/11 17:34:14	2.5
+++ ray/src/px/vgaimage.c	2004/01/02 12:47:01	2.11
@@ -1,13 +1,12 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: vgaimage.c,v 2.11 2004/01/02 12:47:01 schorsch Exp $";
 #endif
-
 /*
  *  vgaimage.c - driver for VGA board under DOS
  */
 
+#include <stdio.h>
+
 #include  "standard.h"
 #include  <graph.h>
 #include  "color.h"
@@ -73,7 +72,7 @@ char  errmsg[128];
 
 extern BYTE  clrtab[256][3];		/* global color map */
 
-extern long  ftell();
+static gethfunc headline;
 
 
 main(argc, argv)
@@ -82,11 +81,10 @@ char  *argv[];
 {
 	extern char  *getenv(), *fixargv0();
 	char  *gv;
-	int  headline();
 	int  i;
 
 	progname = argv[0] = fixargv0(argv[0]);
-	if ((gv = getenv("GAMMA")) != NULL)
+	if ((gv = getenv("DISPLAY_GAMMA")) != NULL)
 		gamcor = atof(gv);
 
 	for (i = 1; i < argc; i++)
@@ -147,8 +145,11 @@ userr:
 }
 
 
-headline(s)		/* get relevant info from header */
-char  *s;
+static int
+headline(		/* get relevant info from header */
+	char	*s,
+	void	*p
+)
 {
 	char  fmt[32];
 
@@ -158,6 +159,7 @@ char  *s;
 		formatval(fmt, s);
 		wrongformat = strcmp(fmt, COLRFMT);
 	}
+	return(0);
 }
 
 
@@ -168,10 +170,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 +381,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);