ViewVC Help

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

root/Development/ray/src/px/pfilt.c

Comparing ray/src/px/pfilt.c (file contents):
Revision 1.15 by greg, Fri Dec 14 16:33:16 1990 UTC vs.
Revision 2.5 by greg, Fri Oct 2 16:24:06 1992 UTC

#	Line 1 | Line 1
1	<	/* Copyright (c) 1986 Regents of the University of California */
1	>	/* Copyright (c) 1992 Regents of the University of California */
2
3		#ifndef lint
4		static char SCCSid[] = "$SunId$ LBL";
#	Line 12 | Line 12 | static char SCCSid[] = "$SunId$ LBL";
12
13		#include  <stdio.h>
14
15	+	#ifdef MSDOS
16	+	#include  <fcntl.h>
17	+	#endif
18	+
19	+	#include  <math.h>
20	+
21		#include  <signal.h>
22
23		#include  "color.h"
24
25	+	#include  "resolu.h"
26	+
27	+	#include  "paths.h"
28	+
29		extern char  *malloc();
30		extern float  *matchlamp();
31
32	<	#define  FEQ(a,b)       ((a) >= .98*(b) && (a) <= 1.02*(b))
32	>	#define  FEQ(a,b)       ((a) >= .98*(b) && (a) <= 1.02*(b))
33
34	<	#define  CHECKRAD       1.5     /* radius to check for filtering */
34	>	#define  CHECKRAD       1.5     /* radius to check for filtering */
35
36		COLOR  exposure = WHTCOLOR;     /* exposure for the frame */
37
38	<	double  rad = 0.0;              /* output pixel radius for filtering */
38	>	double  rad = 0.0;              /* output pixel radius for filtering */
39
40		int  nrows = 0;                 /* number of rows for output */
41		int  ncols = 0;                 /* number of columns for output */
42
43	<	double  x_c = 1.0;              /* ratio of output x size to input */
44	<	double  y_r = 1.0;              /* ratio of output y size to input */
43	>	double  x_c = 1.0;              /* ratio of output x size to input */
44	>	double  y_r = 1.0;              /* ratio of output y size to input */
45
46		int  singlepass = 0;            /* true means skip first pass */
47
48		int  avghot = 0;                /* true means average in bright spots */
49
50	<	double  hotlvl = 1000.0;        /* level considered "hot" */
50	>	double  hotlvl = 1000.0;        /* level considered "hot" */
51
52		int  npts = 0;                  /* (half) number of points for stars */
53
54	<	double  spread = 1e-4;          /* spread for star points */
54	>	double  spread = 1e-4;          /* spread for star points */
55
46	–	#define  TEMPLATE       "/usr/tmp/pfXXXXXX"
47	–
56		char  *tfname = NULL;
57
58		char  *lampdat = "lamp.tab";    /* lamp data file */
59
60	+	int  order;                     /* scanline ordering of input */
61		int  xres, yres;                /* resolution of input */
62	<	double  inpaspect = 1.0;        /* pixel aspect ratio of input */
62	>	double  inpaspect = 1.0;        /* pixel aspect ratio of input */
63		int  correctaspect = 0;         /* aspect ratio correction? */
64
65	+	int  wrongformat = 0;
66	+
67		int  xrad;                      /* x window size */
68		int  yrad;                      /* y window size */
69
#	Line 67 | Line 78 | main(argc, argv)
78		int  argc;
79		char  **argv;
80		{
70	–	extern char  *mktemp();
71	–	extern double  atof(), pow();
81		extern long  ftell();
82		extern int  quit(), headline();
83		FILE  *fin;
84		float  *lampcolor;
85		char  *lamptype = NULL;
86		long  fpos;
87	<	double  outaspect = 0.0;
88	<	double  d;
89	<	int  i;
90	<
87	>	double  outaspect = 0.0;
88	>	double  d;
89	>	int  i, j;
90	>	#ifdef MSDOS
91	>	extern int  _fmode;
92	>	_fmode = O_BINARY;
93	>	setmode(fileno(stdin), O_BINARY);
94	>	setmode(fileno(stdout), O_BINARY);
95	>	#endif
96		if (signal(SIGINT, quit) == SIG_IGN)
97		signal(SIGINT, SIG_IGN);
98		if (signal(SIGHUP, quit) == SIG_IGN)
99		signal(SIGINT, SIG_IGN);
100		signal(SIGTERM, quit);
101		signal(SIGPIPE, quit);
102	<	#ifdef  SIGXCPU
102	>	#ifdef  SIGXCPU
103		signal(SIGXCPU, quit);
104		signal(SIGXFSZ, quit);
105		#endif
#	Line 194 | Line 208 | char  **argv;
208		fprintf(stderr, "%s: unknown lamp type\n", lamptype);
209		quit(1);
210		}
211	<	colval(exposure,RED) /= lampcolor[0];
212	<	colval(exposure,GRN) /= lampcolor[1];
213	<	colval(exposure,BLU) /= lampcolor[2];
211	>	for (i = 0; i < 3; i++)
212	>	if (lampcolor[i] > 1e-4)
213	>	colval(exposure,i) /= lampcolor[i];
214		freelamps();
215		}
216		/* open input file */
#	Line 227 | Line 241 | char  **argv;
241		quit(1);
242		}
243		/* get header */
244	<	getheader(fin, headline);
244	>	getheader(fin, headline, NULL);
245	>	if (wrongformat) {
246	>	fprintf(stderr, "%s: input must be a Radiance picture\n",
247	>	progname);
248	>	quit(1);
249	>	}
250		/* add new header info. */
251		printargs(i, argv, stdout);
252		/* get picture size */
253	<	if (fgetresolu(&xres, &yres, fin) != (YMAJOR|YDECR)) {
253	>	if ((order = fgetresolu(&xres, &yres, fin)) < 0) {
254		fprintf(stderr, "%s: bad picture size\n", progname);
255		quit(1);
256		}
257	+	if (!(order & YMAJOR))
258	+	inpaspect = 1.0/inpaspect;
259		/* compute output resolution */
260		if (ncols <= 0)
261		ncols = x_c*xres + .5;
#	Line 273 | Line 294 | char  **argv;
294		headline(s)                             /* process line from header */
295		char  *s;
296		{
297	+	char  fmt[32];
298	+
299		fputs(s, stdout);               /* copy to output */
300		if (isaspect(s))                /* get aspect ratio */
301		inpaspect *= aspectval(s);
302	+	else if (isformat(s)) {
303	+	formatval(fmt, s);
304	+	wrongformat = strcmp(fmt, COLRFMT);
305	+	}
306		}
307
308
#	Line 332 | Line 359 | FILE  *in;
359		int  yread;
360		int  ycent, xcent;
361		int  r, c;
362	<
362	>
363		pass2init();
364		scan2init();
365		yread = 0;
#	Line 375 | Line 402 | FILE  *in;
402		scan2init()                     /* prepare scanline arrays */
403		{
404		COLOR   ctmp;
405	<	double  d;
405	>	double  d;
406		register int  i;
407
408		if (rad <= 0.0) {
#	Line 390 | Line 417 | scan2init()                    /* prepare scanline arrays */
417
418		initmask();             /* initialize filter table */
419		}
420	<	barsize = 2 * yrad;
420	>	barsize = 2*yrad + 1;
421		scanin = (COLOR **)malloc(barsize*sizeof(COLOR *));
422		for (i = 0; i < barsize; i++) {
423		scanin[i] = (COLOR *)malloc(xres*sizeof(COLOR));
#	Line 406 | Line 433 | scan2init()                    /* prepare scanline arrays */
433		}
434		/* record pixel aspect ratio */
435		if (!correctaspect) {
436	<	d = x_c / y_r;
436	>	d = order & YMAJOR ? x_c/y_r : y_r/x_c ;
437		if (!FEQ(d,1.0))
438		fputaspect(d, stdout);
439		}
#	Line 422 | Line 449 | scan2init()                    /* prepare scanline arrays */
449		fputcolcor(ctmp, stdout);
450		printf("\n");
451		/* write out resolution */
452	<	fputresolu(YMAJOR|YDECR, ncols, nrows, stdout);
452	>	fputresolu(order, ncols, nrows, stdout);
453		}
454
455

Diff Legend

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