ViewVC Help

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

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

Comparing ray/src/px/ra_pr24.c (file contents):
Revision 2.1 by greg, Tue Nov 12 16:04:46 1991 UTC vs.
Revision 2.8 by greg, Sun Feb 27 10:17:15 1994 UTC

#	Line 1 | Line 1
1	<	/* Copyright (c) 1991 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 10 | Line 10 | static char SCCSid[] = "$SunId$ LBL";
10
11		#include  <stdio.h>
12
13	+	#ifdef MSDOS
14	+	#include  <fcntl.h>
15	+	#endif
16	+
17	+	#include  <math.h>
18	+
19		#include  "rasterfile.h"
20
21		#include  "color.h"
22
23		#include  "resolu.h"
24
25	<	extern double  atof(), pow();
25	>	extern char  *malloc();
26
27	<	double  gamma = 2.2;                    /* gamma correction */
27	>	double  gamcor = 2.2;                   /* gamma correction */
28
29		int  bradj = 0;                         /* brightness adjustment */
30
#	Line 34 | Line 40 | char  *argv[];
40		struct rasterfile  head;
41		int  reverse = 0;
42		int  i;
43	<
43	>	#ifdef MSDOS
44	>	extern int  _fmode;
45	>	_fmode = O_BINARY;
46	>	setmode(fileno(stdin), O_BINARY);
47	>	setmode(fileno(stdout), O_BINARY);
48	>	#endif
49		progname = argv[0];
50
51		head.ras_type = RT_STANDARD;
#	Line 42 | Line 53 | char  *argv[];
53		if (argv[i][0] == '-')
54		switch (argv[i][1]) {
55		case 'g':
56	<	gamma = atof(argv[++i]);
56	>	gamcor = atof(argv[++i]);
57		break;
58		case 'e':
59		if (argv[i+1][0] != '+' && argv[i+1][0] != '-')
#	Line 69 | Line 80 | char  *argv[];
80		exit(1);
81		}
82		if (i == argc-2 && freopen(argv[i+1], "w", stdout) == NULL) {
83	<	fprintf(stderr, "can't open output \"%s\"\n",
83	>	fprintf(stderr, "%s: can't open output \"%s\"\n",
84		progname, argv[i+1]);
85		exit(1);
86		}
87	<	setcolrgam(gamma);
87	>	setcolrgam(gamcor);
88		if (reverse) {
89		/* get header */
90		if (fread((char *)&head, sizeof(head), 1, stdin) != 1)
#	Line 88 | Line 99 | char  *argv[];
99		|| head.ras_depth != 24)
100		quiterr("incompatible format");
101		/* put header */
102	+	newheader("RADIANCE", stdout);
103		printargs(i, argv, stdout);
104		fputformat(COLRFMT, stdout);
105		putchar('\n');
106		fprtresolu(xmax, ymax, stdout);
107		/* convert file */
108	<	pr2ra(head.ras_type);
108	>	pr2ra(head.ras_type, head.ras_length/ymax - xmax*3);
109		} else {
110		/* get header info. */
111		if (checkheader(stdin, COLRFMT, NULL) < 0 ||
#	Line 101 | Line 113 | char  *argv[];
113		quiterr("bad picture format");
114		/* write rasterfile header */
115		head.ras_magic = RAS_MAGIC;
116	<	head.ras_width = xmax;
116	>	head.ras_width = xmax + (xmax&1);
117		head.ras_height = ymax;
118		head.ras_depth = 24;
119	<	head.ras_length = xmax*ymax*3;
119	>	head.ras_length = head.ras_width*head.ras_height*3;
120		head.ras_maptype = RMT_NONE;
121		head.ras_maplength = 0;
122		fwrite((char *)&head, sizeof(head), 1, stdout);
123		/* convert file */
124	<	ra2pr(head.ras_type);
124	>	ra2pr(head.ras_type, head.ras_length/ymax - xmax*3);
125		}
126		exit(0);
127		userr:
#	Line 130 | Line 142 | char  *err;
142		}
143
144
145	<	pr2ra(rf)               /* convert 24-bit scanlines to Radiance picture */
145	>	pr2ra(rf, pad)          /* convert 24-bit scanlines to Radiance picture */
146		int     rf;
147	+	int     pad;
148		{
149		COLR    *scanout;
150		register int    x;
#	Line 154 | Line 167 | int    rf;
167		scanout[x][GRN] = getc(stdin);
168		scanout[x][RED] = getc(stdin);
169		}
170	+	for (x = pad; x--; getc(stdin));
171		if (feof(stdin) || ferror(stdin))
172		quiterr("error reading rasterfile");
173		gambs_colrs(scanout, xmax);
#	Line 167 | Line 181 | int    rf;
181		}
182
183
184	<	ra2pr(rf)               /* convert Radiance scanlines to 24-bit rasterfile */
185	<	int  rf;
184	>	ra2pr(rf, pad)          /* convert Radiance scanlines to 24-bit rasterfile */
185	>	int     rf;
186	>	int     pad;
187		{
188	+	int     ord[3];
189		COLR    *scanin;
190		register int    x;
191		int     y;
#	Line 177 | Line 193 | int  rf;
193		scanin = (COLR *)malloc(xmax*sizeof(COLR));
194		if (scanin == NULL)
195		quiterr("out of memory in ra2pr");
196	+	if (rf == RT_FORMAT_RGB) {
197	+	ord[0] = RED; ord[1] = GRN; ord[2] = BLU;
198	+	} else {
199	+	ord[0] = BLU; ord[1] = GRN; ord[2] = RED;
200	+	}
201		/* convert image */
202		for (y = ymax-1; y >= 0; y--) {
203		if (freadcolrs(scanin, xmax, stdin) < 0)
#	Line 196 | Line 217 | int  rf;
217		putc(scanin[x][GRN], stdout);
218		putc(scanin[x][RED], stdout);
219		}
220	+	for (x = 0; x < pad; x++)
221	+	putc(scanin[xmax-1][ord[x%3]], stdout);
222		if (ferror(stdout))
223		quiterr("error writing rasterfile");
224		}

Diff Legend

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