19 |
|
#include "plocate.h" |
20 |
|
#include "rhdisp.h" |
21 |
|
#include "rhd_qtree.h" |
22 |
< |
#include "x11icon.h" |
22 |
> |
#include "x11icon.h" |
23 |
|
|
24 |
|
#ifndef RAYQLEN |
25 |
|
#define RAYQLEN 50000 /* max. rays to queue before flush */ |
54 |
|
|
55 |
|
struct driver odev; /* global device driver structure */ |
56 |
|
|
57 |
+ |
TMstruct *tmGlobal; /* global tone-mapping structure */ |
58 |
+ |
|
59 |
|
char odev_args[64]; /* command arguments */ |
60 |
|
|
61 |
|
static XEvent currentevent; /* current event */ |
167 |
|
&myprims[BLU][CIEX],&myprims[BLU][CIEY], |
168 |
|
&myprims[WHT][CIEX],&myprims[WHT][CIEY]) >= 6) |
169 |
|
dpri = myprims; |
170 |
< |
if (tmInit(mytmflags(), dpri, gamval) == NULL) |
170 |
> |
tmGlobal = tmInit(mytmflags(), dpri, gamval); |
171 |
> |
if (tmGlobal == NULL) |
172 |
|
error(SYSTEM, "not enough memory in dev_open"); |
173 |
|
/* open window */ |
174 |
|
ourwinattr.background_pixel = ourblack; |
228 |
|
XCloseDisplay(ourdisplay); |
229 |
|
ourdisplay = NULL; |
230 |
|
qtFreeLeaves(); |
231 |
< |
tmDone(NULL); |
231 |
> |
tmDone(tmGlobal); |
232 |
|
odev.v.type = 0; |
233 |
|
odev.hres = odev.vres = 0; |
234 |
|
odev.ifd = -1; |