--- ray/src/rt/x11.c	1992/05/30 09:32:18	2.4
+++ ray/src/rt/x11.c	1992/06/25 13:32:47	2.7
@@ -23,7 +23,7 @@ static char SCCSid[] = "$SunId$ LBL";
 #include  "x11twind.h"
 #include  "x11icon.h"
 
-#define GAMMA		2.2		/* exponent for color correction */
+#define GAMMA		2.2		/* default exponent correction */
 
 #define MINWIDTH	(32*COMCW)	/* minimum graphics window width */
 #define MINHEIGHT	MINWIDTH	/* minimum graphics window height */
@@ -82,6 +82,8 @@ struct driver *
 x11_init(name, id)		/* initialize driver */
 char  *name, *id;
 {
+	extern char  *getenv();
+	char  *gv;
 	int  nplanes;
 	XSetWindowAttributes	ourwinattr;
 	XWMHints  ourxwmhints;
@@ -117,8 +119,12 @@ char  *name, *id;
 		ourblack = BlackPixel(ourdisplay,ourscreen);
 		ourwhite = WhitePixel(ourdisplay,ourscreen);
 	}
-	make_gmap(GAMMA);
-	/* open window */
+					/* set gamma */
+	if ((gv = getenv("GAMMA")) != NULL)
+		make_gmap(atof(gv));
+	else
+		make_gmap(GAMMA);
+					/* open window */
 	ourwinattr.background_pixel = ourblack;
 	ourwinattr.border_pixel = ourblack;
 					/* this is stupid */
@@ -133,7 +139,6 @@ char  *name, *id;
 		stderr_v("cannot create window\n");
 		return(NULL);
 	}
-	XFreeColormap(ourdisplay, ourwinattr.colormap);
    	XStoreName(ourdisplay, gwind, id);
 	/* create a cursor */
 	pickcursor = XCreateFontCursor(ourdisplay, XC_diamond_cross);
@@ -402,6 +407,8 @@ freepixels()				/* free our pixels */
 	if (ncolors == 0)
 		return;
 	XFreeColors(ourdisplay,ourmap,pixval,ncolors,0L);
+	free((char *)pixval);
+	pixval = NULL;
 	ncolors = 0;
 	if (ourmap != DefaultColormap(ourdisplay,ourscreen))
 		XFreeColormap(ourdisplay, ourmap);