ViewVC Help

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

root/radiance/ray/src/px/x11image.c

Comparing ray/src/px/x11image.c (file contents):
Revision 1.2 by greg, Thu Mar 1 18:13:31 1990 UTC vs.
Revision 2.61 by schorsch, Mon Jun 30 14:59:12 2003 UTC

#	Line 1 | Line 1
1	–	/* Copyright (c) 1990 Regents of the University of California */
2	–
1		#ifndef lint
2	<	static char SCCSid[] = "$SunId$ LBL";
2	>	static const char RCSid[] = "$Id";
3		#endif
6	–
4		/*
5		*  x11image.c - driver for X-windows
6		*
#	Line 21 | Line 18 | static char SCCSid[] = "$SunId$ LBL";
18
19		#include  "standard.h"
20
21	+	#include  <string.h>
22	+	#include  <signal.h>
23		#include  <X11/Xlib.h>
24		#include  <X11/cursorfont.h>
25		#include  <X11/Xutil.h>
26	+	#include  <X11/Xatom.h>
27
28		#include  "color.h"
29	+	#include  "tonemap.h"
30		#include  "view.h"
30	–	#include  "pic.h"
31		#include  "x11raster.h"
32		#include  "random.h"
33
34		#define  FONTNAME       "8x13"          /* text font we'll use */
35
36	<	#define  CTRL(c)        ('c'-'@')
36	>	#define  CTRL(c)        ((c)-'@')
37
38		#define  BORWIDTH       5               /* border width */
39
40	+	#define  ICONSIZ        (8*10)          /* maximum icon dimension (even 8) */
41	+
42	+	#define  FIXWEIGHT      20              /* weight to add for fixation points */
43	+
44		#define  ourscreen      DefaultScreen(thedisplay)
41	–	#define  ourblack       BlackPixel(thedisplay,ourscreen)
42	–	#define  ourwhite       WhitePixel(thedisplay,ourscreen)
45		#define  ourroot        RootWindow(thedisplay,ourscreen)
44	–	#define  ourgc          DefaultGC(thedisplay,ourscreen)
46
47	+	#define  revline(x0,y0,x1,y1)   XDrawLine(thedisplay,wind,revgc,x0,y0,x1,y1)
48	+
49		#define  redraw(x,y,w,h) patch_raster(wind,(x)-xoff,(y)-yoff,x,y,w,h,ourras)
50
51		double  gamcor = 2.2;                   /* gamma correction */
52	+	char  *gamstr = NULL;                   /* gamma value override */
53
54		int  dither = 1;                        /* dither colors? */
55		int  fast = 0;                          /* keep picture in Pixmap? */
56
57	<	Window  wind = 0;                       /* our output window */
54	<	Font  fontid;                           /* our font */
57	>	char    *dispname = NULL;               /* our display name */
58
59	+	Window  wind = 0;                       /* our output window */
60	+	unsigned long  ourblack=0, ourwhite=1;  /* black and white for this visual */
61		int  maxcolors = 0;                     /* maximum colors */
62		int  greyscale = 0;                     /* in grey */
63
#	Line 61 | Line 66 | int  scale = 0;                                /* scalefactor; power of two */
66		int  xoff = 0;                          /* x image offset */
67		int  yoff = 0;                          /* y image offset */
68
69	+	int  parent = 0;                        /* number of children, -1 if child */
70	+	int  sequential = 0;                    /* display images in sequence */
71	+
72	+	char  *tout = "od";                     /* output of 't' command */
73	+	int  tinterv = 0;                       /* interval between mouse reports */
74	+
75	+	int  tmflags = TM_F_LINEAR;             /* tone mapping flags */
76	+
77		VIEW  ourview = STDVIEW;                /* image view parameters */
78		int  gotview = 0;                       /* got parameters from file */
79
80		COLR  *scanline;                        /* scan line buffer */
81	+	TMbright  *lscan;                       /* encoded luminance scanline */
82	+	BYTE  *cscan;                           /* encoded chroma scanline */
83	+	BYTE  *pscan;                           /* compute pixel scanline */
84
85	<	int  xmax, ymax;                        /* picture resolution */
85	>	RESOLU  inpres;                         /* input resolution and ordering */
86	>	int  xmax, ymax;                        /* picture dimensions */
87		int  width, height;                     /* window size */
88		char  *fname = NULL;                    /* input file name */
89	<	FILE  *fin = stdin;                     /* input file */
89	>	FILE  *fin = NULL;                      /* input file */
90		long  *scanpos = NULL;                  /* scan line positions in file */
91		int  cury = 0;                          /* current scan location */
92
93		double  exposure = 1.0;                 /* exposure compensation used */
94
95	<	XRASTER *ourras;                        /* our stored image */
95	>	int  wrongformat = 0;                   /* input in another format? */
96	>
97	>	GC      ourgc;                          /* standard graphics context */
98	>	GC      revgc;                          /* graphics context with GXinvert */
99	>
100	>	int             *ourrank;               /* our visual class ranking */
101	>	XVisualInfo     ourvis;                 /* our visual */
102	>	XRASTER         *ourras;                /* our stored image */
103		unsigned char   *ourdata;               /* our image data */
104
105		struct {
106		int  xmin, ymin, xsiz, ysiz;
107	<	}  box = {0, 0, 0, 0};                  /* current box */
107	>	}  bbox = {0, 0, 0, 0};                 /* current bbox */
108
109		char  *geometry = NULL;                 /* geometry specification */
110
111	+	char  icondata[ICONSIZ*ICONSIZ/8];      /* icon bitmap data */
112	+	int  iconwidth = 0, iconheight = 0;
113	+
114		char  *progname;
115
116		char  errmsg[128];
117
118	+	BYTE  clrtab[256][3];                   /* global color map */
119	+
120		extern long  ftell();
121
122	<	extern char  *malloc(), *calloc();
122	>	extern char  *getenv();
123
95	–	extern double  atof(), pow(), log();
96	–
124		Display  *thedisplay;
125	+	Atom  closedownAtom, wmProtocolsAtom;
126
127	+	int  sigrecv;
128	+
129	+	void  onsig(int i) { sigrecv++; }
130	+
131	+
132		main(argc, argv)
133		int  argc;
134		char  *argv[];
135		{
136		int  headline();
137		int  i;
138	+	int  pid;
139
140		progname = argv[0];
141	+	fin = stdin;
142
143		for (i = 1; i < argc; i++)
144		if (argv[i][0] == '-')
145		switch (argv[i][1]) {
146	<	case 'c':
146	>	case 'c':                       /* number of colors */
147		maxcolors = atoi(argv[++i]);
148		break;
149	<	case 'b':
149	>	case 'b':                       /* greyscale only */
150		greyscale = !greyscale;
151		break;
152	<	case 'm':
152	>	case 'm':                       /* monochrome */
153	>	greyscale = 1;
154		maxcolors = 2;
155		break;
156	<	case 'd':
157	<	dither = !dither;
156	>	case 'd':                       /* display or dither */
157	>	if (argv[i][2] == 'i')
158	>	dispname = argv[++i];
159	>	else
160	>	dither = !dither;
161		break;
162	<	case 'f':
162	>	case 'f':                       /* save pixmap */
163		fast = !fast;
164		break;
165	<	case 'e':
166	<	if (argv[i+1][0] != '+' && argv[i+1][0] != '-')
165	>	case 's':                       /* one at a time */
166	>	sequential = !sequential;
167	>	break;
168	>	case 'o':                       /* 't' output */
169	>	tout = argv[i]+2;
170	>	break;
171	>	case 't':                       /* msec interval */
172	>	tinterv = atoi(argv[++i]);
173	>	break;
174	>	case 'e':                       /* exposure comp. */
175	>	i++;
176	>	if (argv[i][0] == 'a') {
177	>	tmflags = TM_F_CAMERA;
178	>	break;
179	>	}
180	>	if (argv[i][0] == 'h') {
181	>	tmflags = TM_F_HUMAN;
182	>	break;
183	>	}
184	>	if (argv[i][0] != '+' && argv[i][0] != '-')
185		goto userr;
186	<	scale = atoi(argv[++i]);
186	>	scale = atoi(argv[i]);
187		break;
188	<	case 'g':
189	<	if (!strcmp(argv[i], "-geometry"))
188	>	case 'g':                       /* gamma comp. */
189	>	if (argv[i][2] == 'e')
190		geometry = argv[++i];
191		else
192	<	gamcor = atof(argv[++i]);
192	>	gamstr = argv[++i];
193		break;
194		default:
195		goto userr;
196		}
197	+	else if (argv[i][0] == '=')
198	+	geometry = argv[i];
199		else
200		break;
201
202	<	if (argc-i == 1) {
202	>	if (i > argc)
203	>	goto userr;
204	>	while (i < argc-1) {
205	>	sigrecv = 0;
206	>	signal(SIGCONT, onsig);
207	>	if ((pid=fork()) == 0) {        /* a child for each picture */
208	>	parent = -1;
209	>	break;
210	>	}
211	>	if (pid < 0)
212	>	quiterr("fork failed");
213	>	parent++;
214	>	while (!sigrecv)
215	>	pause();        /* wait for wake-up call */
216	>	i++;
217	>	}
218	>	if (i < argc) {                 /* open picture file */
219		fname = argv[i];
220		fin = fopen(fname, "r");
221	<	if (fin == NULL) {
222	<	sprintf(errmsg, "can't open file \"%s\"", fname);
148	<	quiterr(errmsg);
149	<	}
221	>	if (fin == NULL)
222	>	quiterr("cannot open picture file");
223		}
224		/* get header */
225	<	getheader(fin, headline);
225	>	getheader(fin, headline, NULL);
226		/* get picture dimensions */
227	<	if (fgetresolu(&xmax, &ymax, fin) != (YMAJOR|YDECR))
228	<	quiterr("bad picture size");
227	>	if (wrongformat || !fgetsresolu(&inpres, fin))
228	>	quiterr("bad picture format");
229	>	xmax = scanlen(&inpres);
230	>	ymax = numscans(&inpres);
231		/* set view parameters */
232		if (gotview && setview(&ourview) != NULL)
233		gotview = 0;
234		if ((scanline = (COLR *)malloc(xmax*sizeof(COLR))) == NULL)
235		quiterr("out of memory");
236
237	<	init();                 /* get file and open window */
237	>	init(argc, argv);                       /* get file and open window */
238
239		for ( ; ; )
240		getevent();             /* main loop */
241		userr:
242		fprintf(stderr,
243	<	"Usage: %s [-geometry spec][-b][-m][-d][-f][-c ncolors][-e +/-stops] file\n",
243	>	"Usage: %s [-di disp][[-ge] spec][-b][-m][-d][-f][-c nclrs][-e spec][-g gamcor][-s][-ospec][-t intvl] pic ..\n",
244		progname);
245	<	quit(1);
245	>	exit(1);
246		}
247
248
249	+	int
250		headline(s)             /* get relevant info from header */
251		char  *s;
252		{
253	<	static char  *altname[] = {"rview","rpict","pinterp",VIEWSTR,NULL};
178	<	register char  **an;
253	>	char  fmt[32];
254
255		if (isexpos(s))
256		exposure *= exposval(s);
257	<	else
258	<	for (an = altname; *an != NULL; an++)
259	<	if (!strncmp(*an, s, strlen(*an))) {
260	<	if (sscanview(&ourview, s+strlen(*an)) > 0)
261	<	gotview++;
187	<	return;
188	<	}
257	>	else if (formatval(fmt, s))
258	>	wrongformat = strcmp(fmt, COLRFMT);
259	>	else if (isview(s) && sscanview(&ourview, s) > 0)
260	>	gotview++;
261	>	return(0);
262		}
263
264
265	<	init()                  /* get data and open window */
265	>	init(argc, argv)                        /* get data and open window */
266	>	int argc;
267	>	char **argv;
268		{
269	<	XSizeHints  oursizhints;
270	<	register int  i;
269	>	XSetWindowAttributes    ourwinattr;
270	>	XClassHint      xclshints;
271	>	XWMHints        xwmhints;
272	>	XSizeHints      xszhints;
273	>	XTextProperty   windowName, iconName;
274	>	XGCValues       xgcv;
275	>	char    *name;
276	>	register int    i;
277
278		if (fname != NULL) {
279		scanpos = (long *)malloc(ymax*sizeof(long));
280		if (scanpos == NULL)
281	<	goto memerr;
281	>	quiterr("out of memory");
282		for (i = 0; i < ymax; i++)
283		scanpos[i] = -1;
284	<	}
285	<	if ((thedisplay = XOpenDisplay(NULL)) == NULL)
286	<	quiterr("can't open display; DISPLAY variable set?");
287	<	wind = XCreateSimpleWindow(thedisplay,
288	<	ourroot, 0, 0, xmax, ymax, BORWIDTH, ourblack, ourwhite);
289	<	if (wind == 0)
290	<	quiterr("can't create window");
291	<	if (maxcolors == 0) {           /* get number of available colors */
292	<	i = DisplayPlanes(thedisplay,ourscreen);
293	<	maxcolors = i > 8 ? 256 : 1<<i;
294	<	if (maxcolors > 4) maxcolors -= 2;
295	<	}
296	<	fontid = XLoadFont(thedisplay, FONTNAME);
297	<	if (fontid == 0)
298	<	quiterr("can't get font");
299	<	XSetFont(thedisplay, ourgc, fontid);
300	<	XStoreName(thedisplay, wind, fname == NULL ? progname : fname);
301	<	XDefineCursor(thedisplay, wind, XCreateFontCursor(thedisplay,
302	<	XC_diamond_cross));
284	>	name = fname;
285	>	} else
286	>	name = progname;
287	>	/* remove directory prefix from name */
288	>	for (i = strlen(name); i-- > 0; )
289	>	if (name[i] == '/')
290	>	break;
291	>	name += i+1;
292	>	if ((thedisplay = XOpenDisplay(dispname)) == NULL)
293	>	quiterr("cannot open display");
294	>	/* set gamma value */
295	>	if (gamstr == NULL)             /* get it from the X server */
296	>	gamstr = XGetDefault(thedisplay, "radiance", "gamma");
297	>	if (gamstr == NULL)             /* get it from the environment */
298	>	gamstr = getenv("DISPLAY_GAMMA");
299	>	if (gamstr != NULL)
300	>	gamcor = atof(gamstr);
301	>	/* get best visual for default screen */
302	>	getbestvis();
303	>	/* store image */
304	>	getras();
305	>	/* get size and position */
306	>	xszhints.flags = 0;
307	>	xszhints.width = xmax; xszhints.height = ymax;
308		if (geometry != NULL) {
309	<	bzero((char *)&oursizhints, sizeof(oursizhints));
310	<	i = XParseGeometry(geometry, &oursizhints.x, &oursizhints.y,
311	<	&oursizhints.width, &oursizhints.height);
312	<	if (i & (XValue|YValue) == (XValue|YValue)) {
313	<	oursizhints.flags |= USPosition;
309	>	i = XParseGeometry(geometry, &xszhints.x, &xszhints.y,
310	>	(unsigned *)&xszhints.width,
311	>	(unsigned *)&xszhints.height);
312	>	if ((i&(WidthValue|HeightValue)) == (WidthValue|HeightValue))
313	>	xszhints.flags |= USSize;
314	>	else
315	>	xszhints.flags |= PSize;
316	>	if ((i&(XValue|YValue)) == (XValue|YValue)) {
317	>	xszhints.flags |= USPosition;
318		if (i & XNegative)
319	<	oursizhints.x += DisplayWidth(thedisplay,ourscreen)-1;
319	>	xszhints.x += DisplayWidth(thedisplay,
320	>	ourscreen)-1-xszhints.width-2*BORWIDTH;
321		if (i & YNegative)
322	<	oursizhints.y += DisplayHeight(thedisplay,ourscreen)-1;
322	>	xszhints.y += DisplayHeight(thedisplay,
323	>	ourscreen)-1-xszhints.height-2*BORWIDTH;
324		}
233	–	if (i & (WidthValue|HeightValue) == (WidthValue|HeightValue))
234	–	oursizhints.flags |= USSize;
235	–	XSetNormalHints(thedisplay, wind, &oursizhints);
325		}
326	<	/* store image */
327	<	getras();
328	<	XSelectInput(thedisplay, wind, ButtonPressMask|ButtonReleaseMask
329	<	|ButtonMotionMask|StructureNotifyMask
330	<	|KeyPressMask|ExposureMask);
326	>	/* open window */
327	>	i = CWEventMask|CWCursor|CWBackPixel|CWBorderPixel;
328	>	ourwinattr.border_pixel = ourwhite;
329	>	ourwinattr.background_pixel = ourblack;
330	>	if (ourvis.visual != DefaultVisual(thedisplay,ourscreen)) {
331	>	ourwinattr.colormap = newcmap(thedisplay, ourscreen, ourvis.visual);
332	>	i |= CWColormap;
333	>	}
334	>	ourwinattr.event_mask = ExposureMask|KeyPressMask|ButtonPressMask|
335	>	ButtonReleaseMask|ButtonMotionMask|StructureNotifyMask;
336	>	ourwinattr.cursor = XCreateFontCursor(thedisplay, XC_diamond_cross);
337	>	wind = XCreateWindow(thedisplay, ourroot, xszhints.x, xszhints.y,
338	>	xszhints.width, xszhints.height, BORWIDTH,
339	>	ourvis.depth, InputOutput, ourvis.visual,
340	>	i, &ourwinattr);
341	>	if (wind == 0)
342	>	quiterr("cannot create window");
343	>	width = xmax;
344	>	height = ymax;
345	>	/* prepare graphics drawing context */
346	>	if ((xgcv.font = XLoadFont(thedisplay, FONTNAME)) == 0)
347	>	quiterr("cannot get font");
348	>	xgcv.foreground = ourblack;
349	>	xgcv.background = ourwhite;
350	>	ourgc = XCreateGC(thedisplay, wind, GCForeground|GCBackground|
351	>	GCFont, &xgcv);
352	>	xgcv.function = GXinvert;
353	>	revgc = XCreateGC(thedisplay, wind, GCForeground|GCBackground|
354	>	GCFunction, &xgcv);
355	>
356	>	/* set up the window manager */
357	>	xwmhints.flags = InputHint|IconPixmapHint;
358	>	xwmhints.input = True;
359	>	xwmhints.icon_pixmap = XCreateBitmapFromData(thedisplay,
360	>	wind, icondata, iconwidth, iconheight);
361	>
362	>	windowName.encoding = iconName.encoding = XA_STRING;
363	>	windowName.format = iconName.format = 8;
364	>	windowName.value = (u_char *)name;
365	>	windowName.nitems = strlen(windowName.value);
366	>	iconName.value = (u_char *)name;
367	>	iconName.nitems = strlen(windowName.value);
368	>
369	>	xclshints.res_name = NULL;
370	>	xclshints.res_class = "Ximage";
371	>	XSetWMProperties(thedisplay, wind, &windowName, &iconName,
372	>	argv, argc, &xszhints, &xwmhints, &xclshints);
373	>	closedownAtom = XInternAtom(thedisplay, "WM_DELETE_WINDOW", False);
374	>	wmProtocolsAtom = XInternAtom(thedisplay, "WM_PROTOCOLS", False);
375	>	XSetWMProtocols(thedisplay, wind, &closedownAtom, 1);
376	>
377		XMapWindow(thedisplay, wind);
243	–	return;
244	–	memerr:
245	–	quiterr("out of memory");
378		} /* end of init */
379
380
381		quiterr(err)            /* print message and exit */
382		char  *err;
383		{
384	<	if (err != NULL) {
385	<	fprintf(stderr, "%s: %s\n", progname, err);
386	<	exit(1);
384	>	register int  es;
385	>	int  cs;
386	>
387	>	if (es = err != NULL)
388	>	fprintf(stderr, "%s: %s: %s\n", progname,
389	>	fname==NULL?"<stdin>":fname, err);
390	>	if (thedisplay != NULL)
391	>	XCloseDisplay(thedisplay);
392	>	if (parent < 0 & sigrecv == 0)
393	>	kill(getppid(), SIGCONT);
394	>	while (parent > 0 && wait(&cs) != -1) { /* wait for any children */
395	>	if (es == 0)
396	>	es = cs>>8 & 0xff;
397	>	parent--;
398		}
399	<	exit(0);
399	>	exit(es);
400		}
401
402
403	<	eputs(s)
404	<	char    *s;
403	>	static int
404	>	viscmp(v1,v2)           /* compare visual to see which is better, descending */
405	>	register XVisualInfo    *v1, *v2;
406		{
407	<	fputs(s, stderr);
407	>	int     bad1 = 0, bad2 = 0;
408	>	register int  *rp;
409	>
410	>	if (v1->class == v2->class) {
411	>	if (v1->class == TrueColor || v1->class == DirectColor) {
412	>	/* prefer 24-bit to 32-bit */
413	>	if (v1->depth == 24 && v2->depth == 32)
414	>	return(-1);
415	>	if (v1->depth == 32 && v2->depth == 24)
416	>	return(1);
417	>	/* go for maximum depth otherwise */
418	>	return(v2->depth - v1->depth);
419	>	}
420	>	/* don't be too greedy */
421	>	if (maxcolors <= 1<<v1->depth && maxcolors <= 1<<v2->depth)
422	>	return(v1->depth - v2->depth);
423	>	return(v2->depth - v1->depth);
424	>	}
425	>	/* prefer Pseudo when < 15-bit */
426	>	if ((v1->class == TrueColor || v1->class == DirectColor) &&
427	>	v1->depth < 15)
428	>	bad1 = 1;
429	>	if ((v2->class == TrueColor || v2->class == DirectColor) &&
430	>	v2->depth < 15)
431	>	bad2 = -1;
432	>	if (bad1 | bad2)
433	>	return(bad1+bad2);
434	>	/* otherwise, use class ranking */
435	>	for (rp = ourrank; *rp != -1; rp++) {
436	>	if (v1->class == *rp)
437	>	return(-1);
438	>	if (v2->class == *rp)
439	>	return(1);
440	>	}
441	>	return(0);
442		}
443
444
445	<	quit(code)
268	<	int  code;
445	>	getbestvis()                    /* get the best visual for this screen */
446		{
447	<	exit(code);
447	>	#ifdef DEBUG
448	>	static char  vistype[][12] = {
449	>	"StaticGray",
450	>	"GrayScale",
451	>	"StaticColor",
452	>	"PseudoColor",
453	>	"TrueColor",
454	>	"DirectColor"
455	>	};
456	>	#endif
457	>	static int      rankings[3][6] = {
458	>	{TrueColor,DirectColor,PseudoColor,GrayScale,StaticGray,-1},
459	>	{PseudoColor,GrayScale,StaticGray,-1},
460	>	{PseudoColor,GrayScale,StaticGray,-1}
461	>	};
462	>	XVisualInfo     *xvi;
463	>	int     vismatched;
464	>	register int    i, j;
465	>
466	>	if (greyscale) {
467	>	ourrank = rankings[2];
468	>	if (maxcolors < 2) maxcolors = 256;
469	>	} else if (maxcolors >= 2 && maxcolors <= 256)
470	>	ourrank = rankings[1];
471	>	else {
472	>	ourrank = rankings[0];
473	>	maxcolors = 256;
474	>	}
475	>	/* find best visual */
476	>	ourvis.screen = ourscreen;
477	>	xvi = XGetVisualInfo(thedisplay,VisualScreenMask,&ourvis,&vismatched);
478	>	if (xvi == NULL)
479	>	quiterr("no visuals for this screen!");
480	>	#ifdef DEBUG
481	>	fprintf(stderr, "Supported visuals:\n");
482	>	for (i = 0; i < vismatched; i++)
483	>	fprintf(stderr, "\ttype %s, depth %d\n",
484	>	vistype[xvi[i].class], xvi[i].depth);
485	>	#endif
486	>	for (i = 0, j = 1; j < vismatched; j++)
487	>	if (viscmp(&xvi[i],&xvi[j]) > 0)
488	>	i = j;
489	>	/* compare to least acceptable */
490	>	for (j = 0; ourrank[j++] != -1; )
491	>	;
492	>	ourvis.class = ourrank[--j];
493	>	ourvis.depth = 1;
494	>	if (viscmp(&xvi[i],&ourvis) > 0)
495	>	quiterr("inadequate visuals on this screen");
496	>	/* OK, we'll use it */
497	>	copystruct(&ourvis, &xvi[i]);
498	>	#ifdef DEBUG
499	>	fprintf(stderr, "Selected visual type %s, depth %d\n",
500	>	vistype[ourvis.class], ourvis.depth);
501	>	#endif
502	>	/* make appropriate adjustments */
503	>	if (ourvis.class == GrayScale || ourvis.class == StaticGray)
504	>	greyscale = 1;
505	>	if (ourvis.depth <= 8 && ourvis.colormap_size < maxcolors)
506	>	maxcolors = ourvis.colormap_size;
507	>	if (ourvis.class == StaticGray) {
508	>	ourblack = 0;
509	>	ourwhite = 255;
510	>	} else if (ourvis.class == PseudoColor) {
511	>	ourblack = BlackPixel(thedisplay,ourscreen);
512	>	ourwhite = WhitePixel(thedisplay,ourscreen);
513	>	if ((ourblack|ourwhite) & ~255L) {
514	>	ourblack = 0;
515	>	ourwhite = 1;
516	>	}
517	>	if (maxcolors > 4)
518	>	maxcolors -= 2;
519	>	} else {
520	>	ourblack = 0;
521	>	ourwhite = ourvis.red_mask|ourvis.green_mask|ourvis.blue_mask;
522	>	}
523	>	XFree((char *)xvi);
524		}
525
526
527		getras()                                /* get raster file */
528		{
276	–	colormap        ourmap;
277	–	unsigned char   rmap[256], gmap[256], bmap[256];
529		XVisualInfo     vinfo;
279	–	register int  i;
530
531		if (maxcolors <= 2) {           /* monochrome */
532		ourdata = (unsigned char *)malloc(ymax*((xmax+7)/8));
533		if (ourdata == NULL)
534		goto fail;
535	<	ourras = make_raster(thedisplay, ourscreen, 1, ourdata,
535	>	ourras = make_raster(thedisplay, &ourvis, 1, ourdata,
536		xmax, ymax, 8);
537		if (ourras == NULL)
538		goto fail;
539		getmono();
540	<	} else if (XMatchVisualInfo(thedisplay,ourscreen,24,TrueColor,&vinfo)) {
541	<	ourdata = (unsigned char *)malloc(xmax*ymax*3);
540	>	} else if (ourvis.class == TrueColor | ourvis.class == DirectColor) {
541	>	int  datsiz = ourvis.depth>16 ? sizeof(int32) : sizeof(int16);
542	>	ourdata = (unsigned char *)malloc(datsiz*xmax*ymax);
543		if (ourdata == NULL)
544		goto fail;
545	<	ourras = make_raster(thedisplay, ourscreen, 24, ourdata,
546	<	xmax, ymax, 8);
545	>	ourras = make_raster(thedisplay, &ourvis, datsiz*8,
546	>	ourdata, xmax, ymax, datsiz*8);
547		if (ourras == NULL)
548		goto fail;
549		getfull();
#	Line 300 | Line 551 | getras()                               /* get raster file */
551		ourdata = (unsigned char *)malloc(xmax*ymax);
552		if (ourdata == NULL)
553		goto fail;
554	<	ourras = make_raster(thedisplay, ourscreen, 8, ourdata,
554	>	ourras = make_raster(thedisplay, &ourvis, 8, ourdata,
555		xmax, ymax, 8);
556		if (ourras == NULL)
557		goto fail;
558		if (greyscale)
559	<	biq(dither,maxcolors,1,ourmap);
559	>	getgrey();
560		else
561	<	ciq(dither,maxcolors,1,ourmap);
562	<	for (i = 0; i < 256; i++) {
312	<	rmap[i] = ourmap[0][i];
313	<	gmap[i] = ourmap[1][i];
314	<	bmap[i] = ourmap[2][i];
315	<	}
316	<	if (init_rcolors(ourras, rmap, gmap, bmap) == 0)
561	>	getmapped();
562	>	if (ourvis.class != StaticGray && !init_rcolors(ourras,clrtab))
563		goto fail;
564		}
565		return;
566		fail:
567	<	quit("could not create raster image");
567	>	quiterr("could not create raster image");
568		}
569
570
571		getevent()                              /* process the next event */
572		{
573	<	union {
328	<	XEvent  u;
329	<	XConfigureEvent  c;
330	<	XExposeEvent  e;
331	<	XButtonPressedEvent  b;
332	<	XKeyPressedEvent  k;
333	<	} e;
573	>	XEvent xev;
574
575	<	XNextEvent(thedisplay, &e.u);
576	<	switch (e.u.type) {
575	>	XNextEvent(thedisplay, &xev);
576	>	switch ((int)xev.type) {
577		case KeyPress:
578	<	docom(&e.k);
578	>	docom(&xev.xkey);
579		break;
580		case ConfigureNotify:
581	<	width = e.c.width;
582	<	height = e.c.height;
581	>	width = xev.xconfigure.width;
582	>	height = xev.xconfigure.height;
583		break;
584		case MapNotify:
585		map_rcolors(ourras, wind);
586		if (fast)
587	<	make_rpixmap(ourras);
587	>	make_rpixmap(ourras, wind);
588	>	if (!sequential & parent < 0 & sigrecv == 0) {
589	>	kill(getppid(), SIGCONT);
590	>	sigrecv--;
591	>	}
592		break;
593		case UnmapNotify:
594	<	unmap_rcolors(ourras);
594	>	if (!fast)
595	>	unmap_rcolors(ourras);
596		break;
597		case Expose:
598	<	redraw(e.e.x, e.e.y, e.e.width, e.e.height);
598	>	redraw(xev.xexpose.x, xev.xexpose.y,
599	>	xev.xexpose.width, xev.xexpose.height);
600		break;
601		case ButtonPress:
602	<	if (e.b.state & (ShiftMask|ControlMask))
603	<	moveimage(&e.b);
602	>	if (xev.xbutton.state & (ShiftMask|ControlMask))
603	>	moveimage(&xev.xbutton);
604		else
605	<	getbox(&e.b);
605	>	switch (xev.xbutton.button) {
606	>	case Button1:
607	>	getbox(&xev.xbutton);
608	>	break;
609	>	case Button2:
610	>	traceray(xev.xbutton.x, xev.xbutton.y);
611	>	break;
612	>	case Button3:
613	>	trackrays(&xev.xbutton);
614	>	break;
615	>	}
616		break;
617	+	case ClientMessage:
618	+	if ((xev.xclient.message_type == wmProtocolsAtom) &&
619	+	(xev.xclient.data.l[0] == closedownAtom))
620	+	quiterr(NULL);
621	+	break;
622		}
623		}
624
625
626	<	docom(ekey)                                     /* execute command */
626	>	traceray(xpos, ypos)                    /* print requested pixel data */
627	>	int  xpos, ypos;
628	>	{
629	>	RREAL  hv[2];
630	>	FVECT  rorg, rdir;
631	>	COLOR  cval;
632	>	register char  *cp;
633	>
634	>	bbox.xmin = xpos; bbox.xsiz = 1;
635	>	bbox.ymin = ypos; bbox.ysiz = 1;
636	>	avgbox(cval);
637	>	scalecolor(cval, 1./exposure);
638	>	pix2loc(hv, &inpres, xpos-xoff, ypos-yoff);
639	>	if (!gotview || viewray(rorg, rdir, &ourview, hv[0], hv[1]) < 0)
640	>	rorg[0] = rorg[1] = rorg[2] =
641	>	rdir[0] = rdir[1] = rdir[2] = 0.;
642	>
643	>	for (cp = tout; *cp; cp++)      /* print what they asked for */
644	>	switch (*cp) {
645	>	case 'o':                       /* origin */
646	>	printf("%e %e %e ", rorg[0], rorg[1], rorg[2]);
647	>	break;
648	>	case 'd':                       /* direction */
649	>	printf("%e %e %e ", rdir[0], rdir[1], rdir[2]);
650	>	break;
651	>	case 'v':                       /* radiance value */
652	>	printf("%e %e %e ", colval(cval,RED),
653	>	colval(cval,GRN), colval(cval,BLU));
654	>	break;
655	>	case 'l':                       /* luminance */
656	>	printf("%e ", luminance(cval));
657	>	break;
658	>	case 'p':                       /* pixel position */
659	>	printf("%d %d ", (int)(hv[0]*inpres.xr),
660	>	(int)(hv[1]*inpres.yr));
661	>	break;
662	>	}
663	>	putchar('\n');
664	>	fflush(stdout);
665	>	return(0);
666	>	}
667	>
668	>
669	>	docom(ekey)                             /* execute command */
670		XKeyPressedEvent  *ekey;
671		{
672		char  buf[80];
#	Line 370 | Line 674 | XKeyPressedEvent  *ekey;
674		XColor  cvx;
675		int  com, n;
676		double  comp;
677	<	FVECT  rorg, rdir;
677	>	RREAL  hv[2];
678
679		n = XLookupString(ekey, buf, sizeof(buf), NULL, NULL);
680		if (n == 0)
#	Line 378 | Line 682 | XKeyPressedEvent  *ekey;
682		com = buf[0];
683		switch (com) {                  /* interpret command */
684		case 'q':
685	<	case CTRL(D):                           /* quit */
686	<	quit(0);
685	>	case 'Q':
686	>	case CTRL('D'):                         /* quit */
687	>	quiterr(NULL);
688		case '\n':
689		case '\r':
690		case 'l':
691		case 'c':                               /* value */
692	<	if (avgbox(cval) == -1)
692	>	if (!avgbox(cval))
693		return(-1);
694		switch (com) {
695		case '\n':
#	Line 392 | Line 697 | XKeyPressedEvent  *ekey;
697		sprintf(buf, "%.3f", intens(cval)/exposure);
698		break;
699		case 'l':                               /* luminance */
700	<	sprintf(buf, "%.0fn", bright(cval)*683.0/exposure);
700	>	sprintf(buf, "%.1fL", luminance(cval)/exposure);
701		break;
702		case 'c':                               /* color */
703		comp = pow(2.0, (double)scale);
#	Line 402 | Line 707 | XKeyPressedEvent  *ekey;
707		colval(cval,BLU)*comp);
708		break;
709		}
710	<	XDrawImageString(thedisplay, wind, ourgc, box.xmin, box.ymin,
711	<	buf, strlen(buf));
710	>	XDrawImageString(thedisplay, wind, ourgc,
711	>	bbox.xmin, bbox.ymin+bbox.ysiz, buf, strlen(buf));
712		return(0);
713		case 'i':                               /* identify (contour) */
714		if (ourras->pixels == NULL)
#	Line 418 | Line 723 | XKeyPressedEvent  *ekey;
723		XStoreColor(thedisplay, ourras->cmap, &cvx);
724		return(0);
725		case 'p':                               /* position */
726	<	sprintf(buf, "(%d,%d)", ekey->x-xoff, ymax-1-ekey->y+yoff);
726	>	pix2loc(hv, &inpres, ekey->x-xoff, ekey->y-yoff);
727	>	sprintf(buf, "(%d,%d)", (int)(hv[0]*inpres.xr),
728	>	(int)(hv[1]*inpres.yr));
729		XDrawImageString(thedisplay, wind, ourgc, ekey->x, ekey->y,
730		buf, strlen(buf));
731		return(0);
732		case 't':                               /* trace */
733	<	if (!gotview) {
734	<	XBell(thedisplay, 0);
733	>	return(traceray(ekey->x, ekey->y));
734	>	case 'a':                               /* auto exposure */
735	>	if (fname == NULL)
736		return(-1);
737	<	}
738	<	viewray(rorg, rdir, &ourview,
739	<	(ekey->x-xoff+.5)/xmax,
740	<	(ymax-1-ekey->y+yoff+.5)/ymax);
741	<	printf("%e %e %e ", rorg[0], rorg[1], rorg[2]);
742	<	printf("%e %e %e\n", rdir[0], rdir[1], rdir[2]);
743	<	fflush(stdout);
744	<	return(0);
737	>	tmflags = TM_F_CAMERA;
738	>	strcpy(buf, "auto exposure...");
739	>	goto remap;
740	>	case 'h':                               /* human response */
741	>	if (fname == NULL)
742	>	return(-1);
743	>	tmflags = TM_F_HUMAN;
744	>	strcpy(buf, "human exposure...");
745	>	goto remap;
746		case '=':                               /* adjust exposure */
747	<	if (avgbox(cval) == -1)
747	>	case '@':                               /* adaptation level */
748	>	if (!avgbox(cval))
749		return(-1);
750	<	n = log(.5/bright(cval))/.69315 - scale;        /* truncate */
751	<	if (n == 0)
752	<	return(0);
753	<	scale_rcolors(ourras, pow(2.0, (double)n));
750	>	comp = bright(cval);
751	>	if (comp < 1e-20) {
752	>	XBell(thedisplay, 0);
753	>	return(-1);
754	>	}
755	>	if (com == '@')
756	>	comp = 106./exposure/
757	>	pow(1.219+pow(comp*WHTEFFICACY/exposure,.4),2.5);
758	>	else
759	>	comp = .5/comp;
760	>	comp = log(comp)/.69315 - scale;
761	>	n = comp < 0 ? comp-.5 : comp+.5 ;      /* round */
762	>	if (tmflags != TM_F_LINEAR)
763	>	tmflags = TM_F_LINEAR;  /* turn off tone mapping */
764	>	else {
765	>	if (n == 0)             /* else check if any change */
766	>	return(0);
767	>	scale_rcolors(ourras, pow(2.0, (double)n));
768	>	}
769		scale += n;
770		sprintf(buf, "%+d", scale);
771	<	XDrawImageString(thedisplay, wind, ourgc, box.xmin, box.ymin,
772	<	buf, strlen(buf));
771	>	remap:
772	>	XDrawImageString(thedisplay, wind, ourgc,
773	>	bbox.xmin, bbox.ymin+bbox.ysiz, buf, strlen(buf));
774		XFlush(thedisplay);
775	<	free(ourdata);
775	>	/* free(ourdata);       This is done in XDestroyImage()! */
776		free_raster(ourras);
777		getras();
778		/* fall through */
779	<	case CTRL(R):                           /* redraw */
780	<	case CTRL(L):
779	>	case CTRL('R'):                         /* redraw */
780	>	case CTRL('L'):
781		unmap_rcolors(ourras);
782		XClearWindow(thedisplay, wind);
783		map_rcolors(ourras, wind);
784		if (fast)
785	<	make_rpixmap(ourras);
785	>	make_rpixmap(ourras, wind);
786		redraw(0, 0, width, height);
787		return(0);
788	+	case 'f':                               /* turn on fast redraw */
789	+	fast = 1;
790	+	make_rpixmap(ourras, wind);
791	+	return(0);
792	+	case 'F':                               /* turn off fast redraw */
793	+	fast = 0;
794	+	free_rpixmap(ourras);
795	+	return(0);
796	+	case '0':                               /* recenter origin */
797	+	if (xoff == 0 & yoff == 0)
798	+	return(0);
799	+	xoff = yoff = 0;
800	+	XClearWindow(thedisplay, wind);
801	+	redraw(0, 0, width, height);
802	+	return(0);
803		case ' ':                               /* clear */
804	<	redraw(box.xmin, box.ymin, box.xsiz, box.ysiz);
804	>	redraw(bbox.xmin, bbox.ymin, bbox.xsiz, bbox.ysiz);
805		return(0);
806		default:
807		XBell(thedisplay, 0);
#	Line 472 | Line 813 | XKeyPressedEvent  *ekey;
813		moveimage(ebut)                         /* shift the image */
814		XButtonPressedEvent  *ebut;
815		{
816	<	union {
817	<	XEvent  u;
477	<	XButtonReleasedEvent    b;
478	<	} e;
816	>	XEvent  e;
817	>	int     mxo, myo;
818
819	<	XMaskEvent(thedisplay, ButtonReleaseMask, &e.u);
820	<	xoff += e.b.x - ebut->x;
821	<	yoff += e.b.y - ebut->y;
819	>	XMaskEvent(thedisplay, ButtonReleaseMask|ButtonMotionMask, &e);
820	>	while (e.type == MotionNotify) {
821	>	mxo = e.xmotion.x;
822	>	myo = e.xmotion.y;
823	>	revline(ebut->x, ebut->y, mxo, myo);
824	>	revbox(xoff+mxo-ebut->x, yoff+myo-ebut->y,
825	>	xoff+mxo-ebut->x+xmax, yoff+myo-ebut->y+ymax);
826	>	XMaskEvent(thedisplay,ButtonReleaseMask|ButtonMotionMask,&e);
827	>	revline(ebut->x, ebut->y, mxo, myo);
828	>	revbox(xoff+mxo-ebut->x, yoff+myo-ebut->y,
829	>	xoff+mxo-ebut->x+xmax, yoff+myo-ebut->y+ymax);
830	>	}
831	>	xoff += e.xbutton.x - ebut->x;
832	>	yoff += e.xbutton.y - ebut->y;
833		XClearWindow(thedisplay, wind);
834		redraw(0, 0, width, height);
835		}
836
837
838	<	getbox(ebut)                            /* get new box */
838	>	getbox(ebut)                            /* get new bbox */
839		XButtonPressedEvent  *ebut;
840		{
841	<	union {
492	<	XEvent  u;
493	<	XButtonReleasedEvent  b;
494	<	XPointerMovedEvent  m;
495	<	}  e;
841	>	XEvent  e;
842
843	<	XMaskEvent(thedisplay, ButtonReleaseMask|ButtonMotionMask, &e.u);
844	<	while (e.u.type == MotionNotify) {
845	<	revbox(ebut->x, ebut->y, box.xmin = e.m.x, box.ymin = e.m.y);
846	<	XMaskEvent(thedisplay,ButtonReleaseMask|ButtonMotionMask,&e.u);
847	<	revbox(ebut->x, ebut->y, box.xmin, box.ymin);
843	>	XMaskEvent(thedisplay, ButtonReleaseMask|ButtonMotionMask, &e);
844	>	while (e.type == MotionNotify) {
845	>	revbox(ebut->x, ebut->y, bbox.xmin = e.xmotion.x, bbox.ymin = e.xmotion.y);
846	>	XMaskEvent(thedisplay,ButtonReleaseMask|ButtonMotionMask,&e);
847	>	revbox(ebut->x, ebut->y, bbox.xmin, bbox.ymin);
848		}
849	<	box.xmin = e.b.x<0 ? 0 : (e.b.x>=width ? width-1 : e.b.x);
850	<	box.ymin = e.b.y<0 ? 0 : (e.b.y>=height ? height-1 : e.b.y);
851	<	if (box.xmin > ebut->x) {
852	<	box.xsiz = box.xmin - ebut->x + 1;
853	<	box.xmin = ebut->x;
849	>	bbox.xmin = e.xbutton.x<0 ? 0 : (e.xbutton.x>=width ? width-1 : e.xbutton.x);
850	>	bbox.ymin = e.xbutton.y<0 ? 0 : (e.xbutton.y>=height ? height-1 : e.xbutton.y);
851	>	if (bbox.xmin > ebut->x) {
852	>	bbox.xsiz = bbox.xmin - ebut->x + 1;
853	>	bbox.xmin = ebut->x;
854		} else {
855	<	box.xsiz = ebut->x - box.xmin + 1;
855	>	bbox.xsiz = ebut->x - bbox.xmin + 1;
856		}
857	<	if (box.ymin > ebut->y) {
858	<	box.ysiz = box.ymin - ebut->y + 1;
859	<	box.ymin = ebut->y;
857	>	if (bbox.ymin > ebut->y) {
858	>	bbox.ysiz = bbox.ymin - ebut->y + 1;
859	>	bbox.ymin = ebut->y;
860		} else {
861	<	box.ysiz = ebut->y - box.ymin + 1;
861	>	bbox.ysiz = ebut->y - bbox.ymin + 1;
862		}
863		}
864
865
866	<	revbox(x0, y0, x1, y1)                  /* draw box with reversed lines */
866	>	trackrays(ebut)                         /* trace rays as mouse moves */
867	>	XButtonPressedEvent  *ebut;
868	>	{
869	>	XEvent  e;
870	>	unsigned long   lastrept;
871	>
872	>	traceray(ebut->x, ebut->y);
873	>	lastrept = ebut->time;
874	>	XMaskEvent(thedisplay, ButtonReleaseMask|ButtonMotionMask, &e);
875	>	while (e.type == MotionNotify) {
876	>	if (e.xmotion.time >= lastrept + tinterv) {
877	>	traceray(e.xmotion.x, e.xmotion.y);
878	>	lastrept = e.xmotion.time;
879	>	}
880	>	XMaskEvent(thedisplay,ButtonReleaseMask|ButtonMotionMask,&e);
881	>	}
882	>	}
883	>
884	>
885	>	revbox(x0, y0, x1, y1)                  /* draw bbox with reversed lines */
886		int  x0, y0, x1, y1;
887		{
888	<	static GC       mygc = 0;
888	>	revline(x0, y0, x1, y0);
889	>	revline(x0, y1, x1, y1);
890	>	revline(x0, y0, x0, y1);
891	>	revline(x1, y0, x1, y1);
892	>	}
893
894	<	if (mygc == 0) {
895	<	mygc = XCreateGC(thedisplay, wind, 0, 0);
896	<	XSetFunction(thedisplay, mygc, GXinvert);
894	>
895	>	int
896	>	colavg(scn, n, cavg)
897	>	register COLR   *scn;
898	>	register int    n;
899	>	COLOR   cavg;
900	>	{
901	>	COLOR   col;
902	>
903	>	while (n--) {
904	>	colr_color(col, *scn++);
905	>	addcolor(cavg, col);
906		}
907	<	XDrawLine(thedisplay, wind, mygc, x0, y0, x1, y0);
530	<	XDrawLine(thedisplay, wind, mygc, x0, y1, x1, y1);
531	<	XDrawLine(thedisplay, wind, mygc, x0, y0, x0, y1);
532	<	XDrawLine(thedisplay, wind, mygc, x1, y0, x1, y1);
533	<	} /* end of revbox */
907	>	}
908
909
910	<	avgbox(clr)                             /* average color over current box */
911	<	COLOR  clr;
910	>	int
911	>	avgbox(cavg)                            /* average color over current bbox */
912	>	COLOR   cavg;
913		{
914	+	double  d;
915	+	register int    rval;
916	+
917	+	setcolor(cavg, 0., 0., 0.);
918	+	rval = dobox(colavg, (char *)cavg);
919	+	if (rval > 0) {
920	+	d = 1./rval;
921	+	scalecolor(cavg, d);
922	+	}
923	+	return(rval);
924	+	}
925	+
926	+
927	+	int
928	+	dobox(f, p)                             /* run function over bbox */
929	+	int     (*f)();                 /* function to call for each subscan */
930	+	char    *p;                     /* pointer to private data */
931	+	{
932		int  left, right, top, bottom;
933		int  y;
541	–	double  d;
542	–	COLOR  ctmp;
543	–	register int  x;
934
935	<	setcolor(clr, 0.0, 0.0, 0.0);
936	<	left = box.xmin - xoff;
547	<	right = left + box.xsiz;
935	>	left = bbox.xmin - xoff;
936	>	right = left + bbox.xsiz;
937		if (left < 0)
938		left = 0;
939		if (right > xmax)
940		right = xmax;
941		if (left >= right)
942	<	return(-1);
943	<	top = box.ymin - yoff;
944	<	bottom = top + box.ysiz;
942	>	return(0);
943	>	top = bbox.ymin - yoff;
944	>	bottom = top + bbox.ysiz;
945		if (top < 0)
946		top = 0;
947		if (bottom > ymax)
948		bottom = ymax;
949		if (top >= bottom)
950	<	return(-1);
950	>	return(0);
951		for (y = top; y < bottom; y++) {
952		if (getscan(y) == -1)
953		return(-1);
954	<	for (x = left; x < right; x++) {
955	<	colr_color(ctmp, scanline[x]);
956	<	addcolor(clr, ctmp);
954	>	(*f)(scanline+left, right-left, p);
955	>	}
956	>	return((right-left)*(bottom-top));
957	>	}
958	>
959	>
960	>	int
961	>	addfix(scn, n)                  /* add fixation points to histogram */
962	>	COLR    *scn;
963	>	int     n;
964	>	{
965	>	if (tmCvColrs(lscan, TM_NOCHROM, scn, n))
966	>	goto tmerr;
967	>	if (tmAddHisto(lscan, n, FIXWEIGHT))
968	>	goto tmerr;
969	>	return;
970	>	tmerr:
971	>	quiterr("tone mapping error");
972	>	}
973	>
974	>
975	>	make_tonemap()                  /* initialize tone mapping */
976	>	{
977	>	int  flags, y;
978	>
979	>	if (tmflags != TM_F_LINEAR && fname == NULL) {
980	>	fprintf(stderr, "%s: cannot adjust tone of standard input\n",
981	>	progname);
982	>	tmflags = TM_F_LINEAR;
983	>	}
984	>	if (tmflags == TM_F_LINEAR) {   /* linear with clamping */
985	>	setcolrcor(pow, 1.0/gamcor);
986	>	return;
987	>	}
988	>	flags = tmflags;                /* histogram adjustment */
989	>	if (greyscale) flags |= TM_F_BW;
990	>	if (tmTop != NULL) {            /* reuse old histogram if one */
991	>	tmDone(tmTop);
992	>	tmTop->flags = flags;
993	>	} else {                        /* else initialize */
994	>	if ((lscan = (TMbright *)malloc(xmax*sizeof(TMbright))) == NULL)
995	>	goto memerr;
996	>	if (greyscale) {
997	>	cscan = TM_NOCHROM;
998	>	if ((pscan = (BYTE *)malloc(sizeof(BYTE)*xmax)) == NULL)
999	>	goto memerr;
1000	>	} else if ((pscan=cscan = (BYTE *)malloc(3*sizeof(BYTE)*xmax))
1001	>	== NULL)
1002	>	goto memerr;
1003	>	/* initialize tm library */
1004	>	if (tmInit(flags, stdprims, gamcor) == NULL)
1005	>	goto memerr;
1006	>	if (tmSetSpace(stdprims, WHTEFFICACY/exposure))
1007	>	goto tmerr;
1008	>	/* compute picture histogram */
1009	>	for (y = 0; y < ymax; y++) {
1010	>	getscan(y);
1011	>	if (tmCvColrs(lscan, TM_NOCHROM, scanline, xmax))
1012	>	goto tmerr;
1013	>	if (tmAddHisto(lscan, xmax, 1))
1014	>	goto tmerr;
1015		}
1016		}
1017	<	d = 1.0/((right-left)*(bottom-top));
1018	<	scalecolor(clr, d);
1019	<	return(0);
1017	>	tmDup();                        /* add fixations to duplicate map */
1018	>	dobox(addfix, NULL);
1019	>	/* (re)compute tone mapping */
1020	>	if (tmComputeMapping(gamcor, 0., 0.))
1021	>	goto tmerr;
1022	>	return;
1023	>	memerr:
1024	>	quiterr("out of memory in make_tonemap");
1025	>	tmerr:
1026	>	quiterr("tone mapping error");
1027		}
1028
1029
1030	+	tmap_colrs(scn, len)            /* apply tone mapping to scanline */
1031	+	register COLR  *scn;
1032	+	int  len;
1033	+	{
1034	+	register BYTE  *ps;
1035	+
1036	+	if (tmflags == TM_F_LINEAR) {
1037	+	if (scale)
1038	+	shiftcolrs(scn, len, scale);
1039	+	colrs_gambs(scn, len);
1040	+	return;
1041	+	}
1042	+	if (len > xmax)
1043	+	quiterr("code error 1 in tmap_colrs");
1044	+	if (tmCvColrs(lscan, cscan, scn, len))
1045	+	goto tmerr;
1046	+	if (tmMapPixels(pscan, lscan, cscan, len))
1047	+	goto tmerr;
1048	+	ps = pscan;
1049	+	if (greyscale)
1050	+	while (len--) {
1051	+	scn[0][RED] = scn[0][GRN] = scn[0][BLU] = *ps++;
1052	+	scn[0][EXP] = COLXS;
1053	+	scn++;
1054	+	}
1055	+	else
1056	+	while (len--) {
1057	+	scn[0][RED] = *ps++;
1058	+	scn[0][GRN] = *ps++;
1059	+	scn[0][BLU] = *ps++;
1060	+	scn[0][EXP] = COLXS;
1061	+	scn++;
1062	+	}
1063	+	return;
1064	+	tmerr:
1065	+	quiterr("tone mapping error");
1066	+	}
1067	+
1068	+
1069		getmono()                       /* get monochrome data */
1070		{
1071		register unsigned char  *dp;
1072		register int    x, err;
1073	<	int     y;
581	<	rgbpixel        *inline;
1073	>	int     y, errp;
1074		short   *cerr;
1075
1076	<	if ((inline = (rgbpixel *)malloc(xmax*sizeof(rgbpixel))) == NULL
1077	<	|| (cerr = (short *)calloc(xmax,sizeof(short))) == NULL)
586	<	quit("out of memory in getmono");
1076	>	if ((cerr = (short *)calloc(xmax,sizeof(short))) == NULL)
1077	>	quiterr("out of memory in getmono");
1078		dp = ourdata - 1;
1079		for (y = 0; y < ymax; y++) {
1080	<	picreadline3(y, inline);
1080	>	getscan(y);
1081	>	add2icon(y, scanline);
1082	>	normcolrs(scanline, xmax, scale);
1083		err = 0;
1084		for (x = 0; x < xmax; x++) {
1085		if (!(x&7))
1086		*++dp = 0;
1087	<	err += rgb_bright(&inline[x]) + cerr[x];
1087	>	errp = err;
1088	>	err += normbright(scanline[x]) + cerr[x];
1089		if (err > 127)
1090		err -= 255;
1091		else
1092	<	*dp |= 1<<(x&07);
1093	<	cerr[x] = err >>= 1;
1092	>	*dp |= 1<<(7-(x&07));
1093	>	err /= 3;
1094	>	cerr[x] = err + errp;
1095		}
1096		}
1097	<	free((char *)inline);
603	<	free((char *)cerr);
1097	>	free((void *)cerr);
1098		}
1099
1100
1101	+	add2icon(y, scan)               /* add a scanline to our icon data */
1102	+	int  y;
1103	+	COLR  *scan;
1104	+	{
1105	+	static short  cerr[ICONSIZ];
1106	+	static int  ynext;
1107	+	static char  *dp;
1108	+	COLR  clr;
1109	+	register int  err;
1110	+	register int    x, ti;
1111	+	int  errp;
1112	+
1113	+	if (iconheight == 0) {          /* initialize */
1114	+	if (xmax <= ICONSIZ && ymax <= ICONSIZ) {
1115	+	iconwidth = xmax;
1116	+	iconheight = ymax;
1117	+	} else if (xmax > ymax) {
1118	+	iconwidth = ICONSIZ;
1119	+	iconheight = ICONSIZ*ymax/xmax;
1120	+	if (iconheight < 1)
1121	+	iconheight = 1;
1122	+	} else {
1123	+	iconwidth = ICONSIZ*xmax/ymax;
1124	+	if (iconwidth < 1)
1125	+	iconwidth = 1;
1126	+	iconheight = ICONSIZ;
1127	+	}
1128	+	ynext = 0;
1129	+	dp = icondata - 1;
1130	+	}
1131	+	if (y < ynext*ymax/iconheight)  /* skip this one */
1132	+	return;
1133	+	err = 0;
1134	+	for (x = 0; x < iconwidth; x++) {
1135	+	if (!(x&7))
1136	+	*++dp = 0;
1137	+	errp = err;
1138	+	ti = x*xmax/iconwidth;
1139	+	copycolr(clr, scan[ti]);
1140	+	normcolrs(&clr, 1, scale);
1141	+	err += normbright(clr) + cerr[x];
1142	+	if (err > 127)
1143	+	err -= 255;
1144	+	else
1145	+	*dp |= 1<<(x&07);
1146	+	err /= 3;
1147	+	cerr[x] = err + errp;
1148	+	}
1149	+	ynext++;
1150	+	}
1151	+
1152	+
1153		getfull()                       /* get full (24-bit) data */
1154		{
1155		int     y;
1156	+	register uint32 *dp;
1157	+	register uint16 *dph;
1158	+	register int    x;
1159	+	/* initialize tone mapping */
1160	+	make_tonemap();
1161	+	/* read and convert file */
1162	+	dp = (uint32 *)ourdata;
1163	+	dph = (uint16 *)ourdata;
1164	+	for (y = 0; y < ymax; y++) {
1165	+	getscan(y);
1166	+	add2icon(y, scanline);
1167	+	tmap_colrs(scanline, xmax);
1168	+	switch (ourras->image->blue_mask) {
1169	+	case 0xff:              /* 24-bit RGB */
1170	+	for (x = 0; x < xmax; x++)
1171	+	*dp++ = (uint32)scanline[x][RED] << 16 |
1172	+	(uint32)scanline[x][GRN] << 8 |
1173	+	(uint32)scanline[x][BLU] ;
1174	+	break;
1175	+	case 0xff0000:          /* 24-bit BGR */
1176	+	for (x = 0; x < xmax; x++)
1177	+	*dp++ = (uint32)scanline[x][RED] |
1178	+	(uint32)scanline[x][GRN] << 8 |
1179	+	(uint32)scanline[x][BLU] << 16 ;
1180	+	break;
1181	+	#if 0
1182	+	case 0x1f:              /* 15-bit RGB */
1183	+	for (x = 0; x < xmax; x++)
1184	+	*dph++ =        (scanline[x][RED] << 7 & 0x7c00) |
1185	+	(scanline[x][GRN] << 2 & 0x3e0) |
1186	+	(unsigned)scanline[x][BLU] >> 3 ;
1187	+	break;
1188	+	case 0x7c00:            /* 15-bit BGR */
1189	+	for (x = 0; x < xmax; x++)
1190	+	*dph++ =        (unsigned)scanline[x][RED] >> 3 |
1191	+	(scanline[x][GRN] << 2 & 0x3e0) |
1192	+	(scanline[x][BLU] << 7 & 0x7c00) ;
1193	+	break;
1194	+	#endif
1195	+	default:                /* unknown */
1196	+	if (ourvis.depth > 16)
1197	+	for (x = 0; x < xmax; x++) {
1198	+	*dp = ourras->image->red_mask &
1199	+	ourras->image->red_mask*scanline[x][RED]/255;
1200	+	*dp |= ourras->image->green_mask &
1201	+	ourras->image->green_mask*scanline[x][GRN]/255;
1202	+	*dp++ |= ourras->image->blue_mask &
1203	+	ourras->image->blue_mask*scanline[x][BLU]/255;
1204	+	}
1205	+	else
1206	+	for (x = 0; x < xmax; x++) {
1207	+	*dph = ourras->image->red_mask &
1208	+	ourras->image->red_mask*scanline[x][RED]/255;
1209	+	*dph |= ourras->image->green_mask &
1210	+	ourras->image->green_mask*scanline[x][GRN]/255;
1211	+	*dph++ |= ourras->image->blue_mask &
1212	+	ourras->image->blue_mask*scanline[x][BLU]/255;
1213	+	}
1214	+	break;
1215	+	}
1216	+	}
1217	+	}
1218
1219	<	for (y = 0; y < ymax; y++)
1220	<	picreadline3(y, (rgbpixel *)(ourdata+y*xmax*3));
1219	>
1220	>	getgrey()                       /* get greyscale data */
1221	>	{
1222	>	int     y;
1223	>	register unsigned char  *dp;
1224	>	register int    x;
1225	>	/* initialize tone mapping */
1226	>	make_tonemap();
1227	>	/* read and convert file */
1228	>	dp = ourdata;
1229	>	for (y = 0; y < ymax; y++) {
1230	>	getscan(y);
1231	>	add2icon(y, scanline);
1232	>	tmap_colrs(scanline, xmax);
1233	>	if (maxcolors < 256)
1234	>	for (x = 0; x < xmax; x++)
1235	>	*dp++ = ((int32)scanline[x][GRN] *
1236	>	maxcolors + maxcolors/2) >> 8;
1237	>	else
1238	>	for (x = 0; x < xmax; x++)
1239	>	*dp++ = scanline[x][GRN];
1240	>	}
1241	>	for (x = 0; x < maxcolors; x++)
1242	>	clrtab[x][RED] = clrtab[x][GRN] =
1243	>	clrtab[x][BLU] = ((int32)x*256 + 128)/maxcolors;
1244		}
1245
1246
1247	+	getmapped()                     /* get color-mapped data */
1248	+	{
1249	+	int     y;
1250	+	/* make sure we can do it first */
1251	+	if (fname == NULL)
1252	+	quiterr("cannot map colors from standard input");
1253	+	/* initialize tone mapping */
1254	+	make_tonemap();
1255	+	/* make histogram */
1256	+	if (new_histo((int32)xmax*ymax) == -1)
1257	+	quiterr("cannot initialize histogram");
1258	+	for (y = 0; y < ymax; y++) {
1259	+	if (getscan(y) < 0)
1260	+	break;
1261	+	add2icon(y, scanline);
1262	+	tmap_colrs(scanline, xmax);
1263	+	cnt_colrs(scanline, xmax);
1264	+	}
1265	+	/* map pixels */
1266	+	if (!new_clrtab(maxcolors))
1267	+	quiterr("cannot create color map");
1268	+	for (y = 0; y < ymax; y++) {
1269	+	getscan(y);
1270	+	tmap_colrs(scanline, xmax);
1271	+	if (dither)
1272	+	dith_colrs(ourdata+y*xmax, scanline, xmax);
1273	+	else
1274	+	map_colrs(ourdata+y*xmax, scanline, xmax);
1275	+	}
1276	+	}
1277	+
1278	+
1279		scale_rcolors(xr, sf)                   /* scale color map */
1280		register XRASTER        *xr;
1281		double  sf;
#	Line 644 | Line 1307 | double sf;
1307		getscan(y)
1308		int  y;
1309		{
1310	+	static int  trunced = -1;               /* truncated file? */
1311	+	skipit:
1312	+	if (trunced >= 0 && y >= trunced) {
1313	+	memset(scanline, '\0', xmax*sizeof(COLR));
1314	+	return(-1);
1315	+	}
1316		if (y != cury) {
1317		if (scanpos == NULL || scanpos[y] == -1)
1318		return(-1);
1319		if (fseek(fin, scanpos[y], 0) == -1)
1320	<	quit("fseek error");
1320	>	quiterr("fseek error");
1321		cury = y;
1322	<	} else if (scanpos != NULL)
1322	>	} else if (scanpos != NULL && scanpos[y] == -1)
1323		scanpos[y] = ftell(fin);
1324
1325	<	if (freadcolrs(scanline, xmax, fin) < 0)
1326	<	quiterr("read error");
1327	<
1325	>	if (freadcolrs(scanline, xmax, fin) < 0) {
1326	>	fprintf(stderr, "%s: %s: unfinished picture\n",
1327	>	progname, fname==NULL?"<stdin>":fname);
1328	>	trunced = y;
1329	>	goto skipit;
1330	>	}
1331		cury++;
1332		return(0);
661	–	}
662	–
663	–
664	–	picreadline3(y, l3)                     /* read in 3-byte scanline */
665	–	int  y;
666	–	register rgbpixel  *l3;
667	–	{
668	–	register int    i;
669	–	/* read scanline */
670	–	if (getscan(y) < 0)
671	–	quiterr("cannot seek for picreadline");
672	–	/* convert scanline */
673	–	normcolrs(scanline, xmax, scale);
674	–	for (i = 0; i < xmax; i++) {
675	–	l3[i].r = scanline[i][RED];
676	–	l3[i].g = scanline[i][GRN];
677	–	l3[i].b = scanline[i][BLU];
678	–	}
679	–	}
680	–
681	–
682	–	picwriteline(y, l)              /* add 8-bit scanline to image */
683	–	int  y;
684	–	pixel  *l;
685	–	{
686	–	bcopy((char *)l, (char *)ourdata+y*xmax, xmax);
687	–	}
688	–
689	–
690	–	picreadcm(map)                  /* do gamma correction */
691	–	colormap  map;
692	–	{
693	–	extern double  pow();
694	–	register int  i, val;
695	–
696	–	for (i = 0; i < 256; i++) {
697	–	val = pow(i/256.0, 1.0/gamcor) * 256.0;
698	–	map[0][i] = map[1][i] = map[2][i] = val;
699	–	}
700	–	}
701	–
702	–
703	–	picwritecm(map)                 /* handled elsewhere */
704	–	colormap  map;
705	–	{
706	–	#ifdef DEBUG
707	–	register int i;
708	–
709	–	for (i = 0; i < 256; i++)
710	–	printf("%d %d %d\n", map[0][i],map[1][i],map[2][i]);
711	–	#endif
1333		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines