ViewVC Help

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

root/Development/ray/src/rt/rv2.c

Comparing ray/src/rt/rv2.c (file contents):
Revision 2.33 by greg, Wed Jan 17 11:00:09 1996 UTC vs.
Revision 2.48 by greg, Thu Apr 14 17:38:06 2005 UTC

#	Line 1 | Line 1
1	–	/* Copyright (c) 1995 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		*  rv2.c - command routines used in tracing a view.
6		*
7	<	*     3/24/87
7	>	*  External symbols declared in rpaint.h
8		*/
9
10	<	#include  "ray.h"
10	>	#include "copyright.h"
11
12	<	#include  "octree.h"
12	>	#include  <ctype.h>
13	>	#include  <string.h>
14
15	+	#include  "platform.h"
16	+	#include  "ray.h"
17	+	#include  "source.h"
18	+	#include  "ambient.h"
19		#include  "otypes.h"
18	–
20		#include  "rpaint.h"
21
22	<	#include  "resolu.h"
22	>	extern int  psample;                    /* pixel sample size */
23	>	extern double  maxdiff;                 /* max. sample difference */
24
23	–	#include  <ctype.h>
24	–
25		#define  CTRL(c)        ((c)-'@')
26
27		#ifdef  SMLFLT
#	Line 30 | Line 30 | static char SCCSid[] = "$SunId$ LBL";
30		#define  sscanvec(s,v)  (sscanf(s,"%lf %lf %lf",v,v+1,v+2)==3)
31		#endif
32
33	–	extern char  *atos();
34	–
35	–	extern FILE  *popen();
36	–
33		extern char  rifname[128];              /* rad input file name */
34
39	–	extern char  VersionID[];
35		extern char  *progname;
36		extern char  *octname;
37
38
39	<	getframe(s)                             /* get a new frame */
40	<	char  *s;
39	>	extern void
40	>	getframe(                               /* get a new frame */
41	>	char  *s
42	>	)
43		{
44		if (getrect(s, &pframe) < 0)
45		return;
#	Line 50 | Line 47 | char  *s;
47		}
48
49
50	<	getrepaint(s)                           /* get area and repaint */
51	<	char  *s;
50	>	extern void
51	>	getrepaint(                             /* get area and repaint */
52	>	char  *s
53	>	)
54		{
55		RECT  box;
56
#	Line 61 | Line 60 | char  *s;
60		}
61
62
63	<	getview(s)                              /* get/show view parameters */
64	<	char  *s;
63	>	extern void
64	>	getview(                                /* get/show view parameters */
65	>	char  *s
66	>	)
67		{
68		FILE  *fp;
69		char  buf[128];
70		char  *fname;
71		int  change = 0;
72	<	VIEW  nv;
72	>	VIEW  nv = ourview;
73
74		while (isspace(*s))
75		s++;
76		if (*s == '-') {                        /* command line parameters */
76	–	copystruct(&nv, &ourview);
77		if (sscanview(&nv, s))
78		newview(&nv);
79		else
#	Line 101 | Line 101 | char  *s;
101		if (buf[0] && buf[0] != ourview.type) {
102		nv.type = buf[0];
103		change++;
104	<	} else
105	<	nv.type = ourview.type;
104	>	}
105		sprintf(buf, "view point (%.6g %.6g %.6g): ",
106		ourview.vp[0], ourview.vp[1], ourview.vp[2]);
107		(*dev->comout)(buf);
#	Line 110 | Line 109 | char  *s;
109		if (buf[0] == CTRL('C')) return;
110		if (sscanvec(buf, nv.vp))
111		change++;
113	–	else
114	–	VCOPY(nv.vp, ourview.vp);
112		sprintf(buf, "view direction (%.6g %.6g %.6g): ",
113	<	ourview.vdir[0], ourview.vdir[1], ourview.vdir[2]);
113	>	ourview.vdir[0]*ourview.vdist,
114	>	ourview.vdir[1]*ourview.vdist,
115	>	ourview.vdir[2]*ourview.vdist);
116		(*dev->comout)(buf);
117		(*dev->comin)(buf, NULL);
118		if (buf[0] == CTRL('C')) return;
119	<	if (sscanvec(buf, nv.vdir))
119	>	if (sscanvec(buf, nv.vdir)) {
120	>	nv.vdist = 1.;
121		change++;
122	<	else
123	<	VCOPY(nv.vdir, ourview.vdir);
122	>	}
123		sprintf(buf, "view up (%.6g %.6g %.6g): ",
124		ourview.vup[0], ourview.vup[1], ourview.vup[2]);
125		(*dev->comout)(buf);
#	Line 128 | Line 127 | char  *s;
127		if (buf[0] == CTRL('C')) return;
128		if (sscanvec(buf, nv.vup))
129		change++;
131	–	else
132	–	VCOPY(nv.vup, ourview.vup);
130		sprintf(buf, "view horiz and vert size (%.6g %.6g): ",
131		ourview.horiz, ourview.vert);
132		(*dev->comout)(buf);
#	Line 137 | Line 134 | char  *s;
134		if (buf[0] == CTRL('C')) return;
135		if (sscanf(buf, "%lf %lf", &nv.horiz, &nv.vert) == 2)
136		change++;
140	–	else {
141	–	nv.horiz = ourview.horiz; nv.vert = ourview.vert;
142	–	}
137		sprintf(buf, "fore and aft clipping plane (%.6g %.6g): ",
138		ourview.vfore, ourview.vaft);
139		(*dev->comout)(buf);
#	Line 147 | Line 141 | char  *s;
141		if (buf[0] == CTRL('C')) return;
142		if (sscanf(buf, "%lf %lf", &nv.vfore, &nv.vaft) == 2)
143		change++;
150	–	else {
151	–	nv.vfore = ourview.vfore; nv.vaft = ourview.vaft;
152	–	}
144		sprintf(buf, "view shift and lift (%.6g %.6g): ",
145		ourview.hoff, ourview.voff);
146		(*dev->comout)(buf);
#	Line 157 | Line 148 | char  *s;
148		if (buf[0] == CTRL('C')) return;
149		if (sscanf(buf, "%lf %lf", &nv.hoff, &nv.voff) == 2)
150		change++;
160	–	else {
161	–	nv.hoff = ourview.hoff; nv.voff = ourview.voff;
162	–	}
151		if (change)
152		newview(&nv);
153		}
154
155
156	<	lastview(s)                             /* return to a previous view */
157	<	char  *s;
156	>	extern void
157	>	lastview(                               /* return to a previous view */
158	>	char  *s
159	>	)
160		{
161		char  buf[128];
162		char  *fname;
#	Line 174 | Line 164 | char  *s;
164		VIEW  nv;
165
166		if (sscanf(s, "%s", buf) == 1) {        /* get parameters from a file */
167	<	copystruct(&nv, &stdview);
167	>	nv = stdview;
168		if ((fname = getpath(buf, "", R_OK)) == NULL ||
169		(success = viewfile(fname, &nv, NULL)) == -1) {
170		sprintf(errmsg, "cannot open \"%s\"", buf);
#	Line 191 | Line 181 | char  *s;
181		error(COMMAND, "no previous view");
182		return;
183		}
184	<	copystruct(&nv, &ourview);
185	<	copystruct(&ourview, &oldview);
186	<	copystruct(&oldview, &nv);
184	>	nv = ourview;
185	>	ourview = oldview;
186	>	oldview = nv;
187		newimage();
188		}
189
190
191	<	saveview(s)                             /* save view to rad file */
192	<	char  *s;
191	>	extern void
192	>	saveview(                               /* save view to rad file */
193	>	char  *s
194	>	)
195		{
196		char  view[64];
197		char  *fname;
#	Line 234 | Line 226 | char  *s;
226		}
227
228
229	<	loadview(s)                             /* load view from rad file */
230	<	char  *s;
229	>	extern void
230	>	loadview(                               /* load view from rad file */
231	>	char  *s
232	>	)
233		{
234		char  buf[512];
235		char  *fname;
#	Line 266 | Line 260 | char  *s;
260		buf[0] = '\0';
261		fgets(buf, sizeof(buf), fp);
262		pclose(fp);
263	<	copystruct(&nv, &stdview);
263	>	nv = stdview;
264		if (!sscanview(&nv, buf)) {
265		error(COMMAND, "rad error -- no such view?");
266		return;
#	Line 275 | Line 269 | char  *s;
269		}
270
271
272	<	getaim(s)                               /* aim camera */
273	<	char  *s;
272	>	extern void
273	>	getaim(                         /* aim camera */
274	>	char  *s
275	>	)
276		{
277	+	VIEW  nv = ourview;
278		double  zfact;
282	–	VIEW  nv;
279
280		if (getinterest(s, 1, nv.vdir, &zfact) < 0)
281		return;
286	–	nv.type = ourview.type;
287	–	VCOPY(nv.vp, ourview.vp);
288	–	VCOPY(nv.vup, ourview.vup);
289	–	nv.horiz = ourview.horiz; nv.vert = ourview.vert;
290	–	nv.vfore = ourview.vfore; nv.vaft = ourview.vaft;
291	–	nv.hoff = ourview.hoff; nv.voff = ourview.voff;
282		zoomview(&nv, zfact);
283		newview(&nv);
284		}
285
286
287	<	getmove(s)                              /* move camera */
288	<	char  *s;
287	>	extern void
288	>	getfocus(                               /* set focus distance */
289	>	char *s
290	>	)
291		{
292		FVECT  vc;
293	+	double  dist;
294	+
295	+	if (sscanf(s, "%lf", &dist) < 1) {
296	+	int     x, y;
297	+	RAY     thisray;
298	+	if (dev->getcur == NULL)
299	+	return;
300	+	(*dev->comout)("Pick focus point\n");
301	+	if ((*dev->getcur)(&x, &y) == ABORT)
302	+	return;
303	+	if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir,
304	+	&ourview, (x+.5)/hresolu, (y+.5)/vresolu)) < -FTINY) {
305	+	error(COMMAND, "not on image");
306	+	return;
307	+	}
308	+	rayorigin(&thisray, NULL, PRIMARY, 1.0);
309	+	if (!localhit(&thisray, &thescene)) {
310	+	error(COMMAND, "not a local object");
311	+	return;
312	+	}
313	+	dist = thisray.rot;
314	+	} else if (dist <= .0) {
315	+	error(COMMAND, "focus distance must be positive");
316	+	return;
317	+	}
318	+	ourview.vdist = dist;
319	+	}
320	+
321	+
322	+	extern void
323	+	getmove(                                /* move camera */
324	+	char  *s
325	+	)
326	+	{
327	+	FVECT  vc;
328		double  mag;
329
330		if (getinterest(s, 0, vc, &mag) < 0)
#	Line 306 | Line 333 | char  *s;
333		}
334
335
336	<	getrotate(s)                            /* rotate camera */
337	<	char  *s;
336	>	extern void
337	>	getrotate(                              /* rotate camera */
338	>	char  *s
339	>	)
340		{
341	<	VIEW  nv;
341	>	VIEW  nv = ourview;
342		FVECT  v1;
343		double  angle, elev, zfact;
344
#	Line 318 | Line 347 | char  *s;
347		error(COMMAND, "missing angle");
348		return;
349		}
321	–	nv.type = ourview.type;
322	–	VCOPY(nv.vp, ourview.vp);
323	–	VCOPY(nv.vup, ourview.vup);
324	–	nv.hoff = ourview.hoff; nv.voff = ourview.voff;
325	–	nv.vfore = ourview.vfore; nv.vaft = ourview.vaft;
350		spinvector(nv.vdir, ourview.vdir, ourview.vup, angle*(PI/180.));
351		if (elev != 0.0) {
352		fcross(v1, nv.vdir, ourview.vup);
353		normalize(v1);
354		spinvector(nv.vdir, nv.vdir, v1, elev*(PI/180.));
355		}
332	–	nv.horiz = ourview.horiz; nv.vert = ourview.vert;
356		zoomview(&nv, zfact);
357		newview(&nv);
358		}
359
360
361	<	getpivot(s)                             /* pivot viewpoint */
362	<	register char  *s;
361	>	extern void
362	>	getpivot(                               /* pivot viewpoint */
363	>	register char  *s
364	>	)
365		{
366		FVECT  vc;
367		double  angle, elev, mag;
#	Line 352 | Line 377 | register char  *s;
377		}
378
379
380	<	getexposure(s)                          /* get new exposure */
381	<	char  *s;
380	>	extern void
381	>	getexposure(                            /* get new exposure */
382	>	char  *s
383	>	)
384		{
385		char  buf[128];
386		register char  *cp;
#	Line 417 | Line 444 | char  *s;
444		redraw();
445		}
446
447	+	typedef union {int i; double d; COLOR C;}       *MyUptr;
448
449	<	getparam(str, dsc, typ, ptr)            /* get variable from user */
450	<	char  *str, *dsc;
451	<	int  typ;
452	<	register union {int i; double d; COLOR C;}  *ptr;
449	>	extern int
450	>	getparam(               /* get variable from user */
451	>	char  *str,
452	>	char  *dsc,
453	>	int  typ,
454	>	void  *p
455	>	)
456		{
457	<	extern char  *index();
457	>	register MyUptr  ptr = (MyUptr)p;
458		int  i0;
459		double  d0, d1, d2;
460		char  buf[48];
#	Line 458 | Line 489 | register union {int i; double d; COLOR C;}  *ptr;
489		(*dev->comout)(buf);
490		(*dev->comin)(buf, NULL);
491		if (buf[0] == '\0' ||
492	<	index("yY+1tTnN-0fF", buf[0]) == NULL)
492	>	strchr("yY+1tTnN-0fF", buf[0]) == NULL)
493		return(0);
494		}
495	<	ptr->i = index("yY+1tT", buf[0]) != NULL;
495	>	ptr->i = strchr("yY+1tT", buf[0]) != NULL;
496		return(1);
497		case 'C':                       /* color */
498		if (sscanf(str, "%lf %lf %lf", &d0, &d1, &d2) != 3) {
#	Line 478 | Line 509 | register union {int i; double d; COLOR C;}  *ptr;
509		setcolor(ptr->C, d0, d1, d2);
510		return(1);
511		}
512	+	return 0; /* nothing matched */
513		}
514
515
516	<	setparam(s)                             /* get/set program parameter */
517	<	register char  *s;
516	>	extern void
517	>	setparam(                               /* get/set program parameter */
518	>	register char  *s
519	>	)
520		{
487	–	extern int  psample;
488	–	extern double  maxdiff;
489	–	extern double  minweight;
490	–	extern int  maxdepth;
491	–	extern double  dstrsrc;
492	–	extern double  shadthresh;
493	–	extern double  shadcert;
494	–	extern COLOR  ambval;
495	–	extern double  ambacc;
496	–	extern int  ambres;
497	–	extern int  ambdiv;
498	–	extern int  ambssamp;
499	–	extern int  ambounce;
500	–	extern COLOR  cextinction;
501	–	extern double  salbedo;
502	–	extern double  seccg;
503	–	extern double  ssampdist;
504	–	extern int  directvis;
505	–	extern double  srcsizerat;
506	–	extern int  do_irrad;
507	–	extern double  specjitter;
508	–	extern double  specthresh;
509	–	extern int  backvis;
521		char  buf[128];
522
523		if (s[0] == '\0') {
524		(*dev->comout)(
525	<	"aa ab ad ar as av b dc dv dj ds dt i lr lw me ma mg ms ps pt sj st bv: ");
525	>	"aa ab ad ar as av aw b dc dv dj ds dt i lr lw me ma mg ms ps pt sj st bv: ");
526		(*dev->comin)(buf, NULL);
527		s = buf;
528		}
#	Line 519 | Line 530 | register char  *s;
530		case 'l':                       /* limit */
531		switch (s[1]) {
532		case 'w':                       /* weight */
533	<	getparam(s+2, "limit weight", 'r', &minweight);
533	>	getparam(s+2, "limit weight", 'r',
534	>	(void *)&minweight);
535		break;
536		case 'r':                       /* reflection */
537	<	getparam(s+2, "limit reflection", 'i', &maxdepth);
537	>	getparam(s+2, "limit reflection", 'i',
538	>	(void *)&maxdepth);
539		break;
540		default:
541		goto badparam;
#	Line 531 | Line 544 | register char  *s;
544		case 'd':                       /* direct */
545		switch (s[1]) {
546		case 'j':                       /* jitter */
547	<	getparam(s+2, "direct jitter", 'r', &dstrsrc);
547	>	getparam(s+2, "direct jitter", 'r',
548	>	(void *)&dstrsrc);
549		break;
550		case 'c':                       /* certainty */
551	<	getparam(s+2, "direct certainty", 'r', &shadcert);
551	>	getparam(s+2, "direct certainty", 'r',
552	>	(void *)&shadcert);
553		break;
554		case 't':                       /* threshold */
555	<	getparam(s+2, "direct threshold", 'r', &shadthresh);
555	>	getparam(s+2, "direct threshold", 'r',
556	>	(void *)&shadthresh);
557		break;
558		case 'v':                       /* visibility */
559	<	getparam(s+2, "direct visibility",
560	<	'b', &directvis);
559	>	getparam(s+2, "direct visibility", 'b',
560	>	(void *)&directvis);
561		break;
562		case 's':                       /* sampling */
563	<	getparam(s+2, "direct sampling", 'r', &srcsizerat);
563	>	getparam(s+2, "direct sampling", 'r',
564	>	(void *)&srcsizerat);
565		break;
566		default:
567		goto badparam;
#	Line 553 | Line 570 | register char  *s;
570		case 'b':                       /* back faces or black and white */
571		switch (s[1]) {
572		case 'v':                       /* back face visibility */
573	<	getparam(s+2, "back face visibility", 'b', &backvis);
573	>	getparam(s+2, "back face visibility", 'b',
574	>	(void *)&backvis);
575		break;
576		case '\0':                      /* black and white */
577		case ' ':
578		case 'y': case 'Y': case 't': case 'T': case '1': case '+':
579		case 'n': case 'N': case 'f': case 'F': case '0': case '-':
580	<	getparam(s+1, "black and white", 'b', &greyscale);
580	>	getparam(s+1, "black and white", 'b',
581	>	(void *)&greyscale);
582		break;
583		default:
584		goto badparam;
585		}
586		break;
587		case 'i':                       /* irradiance */
588	<	getparam(s+1, "irradiance", 'b', &do_irrad);
588	>	getparam(s+1, "irradiance", 'b',
589	>	(void *)&do_irrad);
590		break;
591		case 'a':                       /* ambient */
592		switch (s[1]) {
593		case 'v':                       /* value */
594	<	getparam(s+2, "ambient value", 'C', (COLOR *)ambval);
594	>	getparam(s+2, "ambient value", 'C',
595	>	(void *)ambval);
596		break;
597	+	case 'w':                       /* weight */
598	+	getparam(s+2, "ambient value weight", 'i',
599	+	(void *)&ambvwt);
600	+	break;
601		case 'a':                       /* accuracy */
602	<	if (getparam(s+2, "ambient accuracy", 'r', &ambacc))
602	>	if (getparam(s+2, "ambient accuracy", 'r',
603	>	(void *)&ambacc))
604		setambacc(ambacc);
605		break;
606		case 'd':                       /* divisions */
607	<	getparam(s+2, "ambient divisions", 'i', &ambdiv);
607	>	getparam(s+2, "ambient divisions", 'i',
608	>	(void *)&ambdiv);
609		break;
610		case 's':                       /* samples */
611	<	getparam(s+2, "ambient super-samples", 'i', &ambssamp);
611	>	getparam(s+2, "ambient super-samples", 'i',
612	>	(void *)&ambssamp);
613		break;
614		case 'b':                       /* bounces */
615	<	getparam(s+2, "ambient bounces", 'i', &ambounce);
615	>	getparam(s+2, "ambient bounces", 'i',
616	>	(void *)&ambounce);
617		break;
618		case 'r':
619	<	if (getparam(s+2, "ambient resolution", 'i', &ambres))
619	>	if (getparam(s+2, "ambient resolution", 'i',
620	>	(void *)&ambres))
621		setambres(ambres);
622		break;
623		default:
#	Line 598 | Line 628 | register char  *s;
628		switch (s[1]) {
629		case 'e':                       /* extinction coefficient */
630		getparam(s+2, "extinction coefficient", 'C',
631	<	(COLOR *)cextinction);
631	>	(void *)cextinction);
632		break;
633		case 'a':                       /* scattering albedo */
634	<	getparam(s+2, "scattering albedo", 'r', &salbedo);
634	>	getparam(s+2, "scattering albedo", 'C',
635	>	(void *)salbedo);
636		break;
637		case 'g':                       /* scattering eccentricity */
638	<	getparam(s+2, "scattering eccentricity", 'r', &seccg);
638	>	getparam(s+2, "scattering eccentricity", 'r',
639	>	(void *)&seccg);
640		break;
641		case 's':                       /* sampling distance */
642		getparam(s+2, "mist sampling distance", 'r',
643	<	&ssampdist);
643	>	(void *)&ssampdist);
644		break;
645		default:
646		goto badparam;
#	Line 617 | Line 649 | register char  *s;
649		case 'p':                       /* pixel */
650		switch (s[1]) {
651		case 's':                       /* sample */
652	<	if (getparam(s+2, "pixel sample", 'i', &psample))
652	>	if (getparam(s+2, "pixel sample", 'i',
653	>	(void *)&psample))
654		pdepth = 0;
655		break;
656		case 't':                       /* threshold */
657	<	if (getparam(s+2, "pixel threshold", 'r', &maxdiff))
657	>	if (getparam(s+2, "pixel threshold", 'r',
658	>	(void *)&maxdiff))
659		pdepth = 0;
660		break;
661		default:
#	Line 631 | Line 665 | register char  *s;
665		case 's':                       /* specular */
666		switch (s[1]) {
667		case 'j':                       /* jitter */
668	<	getparam(s+2, "specular jitter", 'r', &specjitter);
668	>	getparam(s+2, "specular jitter", 'r',
669	>	(void *)&specjitter);
670		break;
671		case 't':                       /* threshold */
672	<	getparam(s+2, "specular threshold", 'r', &specthresh);
672	>	getparam(s+2, "specular threshold", 'r',
673	>	(void *)&specthresh);
674		break;
675		default:
676		goto badparam;
#	Line 652 | Line 688 | badparam:
688		}
689
690
691	+	extern void
692		traceray(s)                             /* trace a single ray */
693		char  *s;
694		{
695		char  buf[128];
696		int  x, y;
697	+	OBJREC  *ino;
698		RAY  thisray;
699
700		thisray.rmax = 0.0;
#	Line 688 | Line 726 | char  *s;
726		if (thisray.ro == NULL)
727		(*dev->comout)("ray hit nothing");
728		else {
729	<	sprintf(buf, "ray hit %s%s %s \"%s\"",
730	<	thisray.rod < 0.0 ? "back of " : "",
731	<	thisray.ro->omod == OVOID ? VOIDID :
732	<	objptr(thisray.ro->omod)->oname,
729	>	OBJREC  *mat = NULL;
730	>	OBJREC  *mod = NULL;;
731	>	char    matspec[256];
732	>	matspec[0] = '\0';
733	>	if (thisray.ro->omod != OVOID) {
734	>	mod = objptr(thisray.ro->omod);
735	>	mat = findmaterial(mod);
736	>	}
737	>	if (thisray.rod < 0.0)
738	>	strcpy(matspec, "back of ");
739	>	if (mod != NULL) {
740	>	strcat(matspec, mod->oname);
741	>	if (mat != mod && mat != NULL)
742	>	sprintf(matspec+strlen(matspec),
743	>	" (%s)", mat->oname);
744	>	} else
745	>	strcat(matspec, VOIDID);
746	>	sprintf(buf, "ray hit %s %s \"%s\"", matspec,
747		ofun[thisray.ro->otype].funame,
748		thisray.ro->oname);
749	+	if ((ino = objptr(thisray.robj)) != thisray.ro)
750	+	sprintf(buf+strlen(buf), " in %s \"%s\"",
751	+	ofun[ino->otype].funame, ino->oname);
752		(*dev->comout)(buf);
753		(*dev->comin)(buf, NULL);
754		if (thisray.rot >= FHUGE)
#	Line 705 | Line 760 | char  *s;
760		(*dev->comout)(buf);
761		}
762		(*dev->comin)(buf, NULL);
763	<	sprintf(buf, "value (%.5g %.5g %.5g) (%.1fL)",
763	>	sprintf(buf, "value (%.5g %.5g %.5g) (%.3gL)",
764		colval(thisray.rcol,RED),
765		colval(thisray.rcol,GRN),
766		colval(thisray.rcol,BLU),
#	Line 716 | Line 771 | char  *s;
771		}
772
773
774	+	extern void
775		writepict(s)                            /* write the picture to a file */
776		char  *s;
777		{
#	Line 739 | Line 795 | char  *s;
795		error(COMMAND, errmsg);
796		return;
797		}
798	<	#ifdef MSDOS
743	<	setmode(fileno(fp), O_BINARY);
744	<	#endif
798	>	SET_FILE_BINARY(fp);
799		(*dev->comout)("writing \"");
800		(*dev->comout)(fname);
801		(*dev->comout)("\"...\n");
#	Line 754 | Line 808 | char  *s;
808		else
809		putc('\n', fp);
810		fprintf(fp, "SOFTWARE= %s\n", VersionID);
811	+	fputnow(fp);
812		if (exposure != 1.0)
813		fputexpos(exposure, fp);
814		if (dev->pixaspect != 1.0)
#	Line 774 | Line 829 | char  *s;
829		if (fwritecolrs(scanline, hresolu, fp) < 0)
830		break;
831		}
832	<	free((char *)scanline);
832	>	free((void *)scanline);
833		if (fclose(fp) < 0)
834		error(COMMAND, "write error");
835		}

Diff Legend

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