ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/hd/rhd_x11.c

Comparing ray/src/hd/rhd_x11.c (file contents):
Revision 3.23 by gregl, Tue Jan 6 05:26:19 1998 UTC vs.
Revision 3.24 by gregl, Tue Jan 6 13:07:57 1998 UTC

#	Line 96 | Line 96 | dev_open(id)                   /* initialize X11 driver */
96		char  *id;
97		{
98		extern char  *getenv();
99	<	char  *gv;
99	>	static RGBPRIMS myprims = STDPRIMS;
100	>	char  *ev;
101		double  gamval = GAMMA;
102	+	RGBPRIMP        dpri = stdprims;
103		int  nplanes;
104		XSetWindowAttributes    ourwinattr;
105		XWMHints  ourxwmhints;
#	Line 130 | Line 132 | char  *id;
132		ourwhite = WhitePixel(ourdisplay,ourscreen);
133		}
134		/* set gamma and tone mapping */
135	<	if ((gv = XGetDefault(ourdisplay, "radiance", "gamma")) != NULL
136	<	|| (gv = getenv("DISPLAY_GAMMA")) != NULL)
137	<	gamval = atof(gv);
138	<	if (tmInit(mytmflags(), stdprims, gamval) == NULL)
135	>	if ((ev = XGetDefault(ourdisplay, "radiance", "gamma")) != NULL
136	>	|| (ev = getenv("DISPLAY_GAMMA")) != NULL)
137	>	gamval = atof(ev);
138	>	if ((ev = getenv("DISPLAY_PRIMARIES")) != NULL &&
139	>	sscanf(ev, "%f %f %f %f %f %f %f %f",
140	>	&myprims[RED][CIEX],&myprims[RED][CIEY],
141	>	&myprims[GRN][CIEX],&myprims[GRN][CIEY],
142	>	&myprims[BLU][CIEX],&myprims[BLU][CIEY],
143	>	&myprims[WHT][CIEX],&myprims[WHT][CIEY]) >= 6)
144	>	dpri = myprims;
145	>	if (tmInit(mytmflags(), dpri, gamval) == NULL)
146		error(SYSTEM, "not enough memory in dev_open");
147		/* open window */
148		ourwinattr.background_pixel = ourblack;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)