ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/px/ra_pict.c
(Generate patch)

Comparing ray/src/px/ra_pict.c (file contents):
Revision 1.1 by greg, Wed Oct 23 09:26:35 1991 UTC vs.
Revision 2.5 by greg, Fri Oct 30 09:14:04 1992 UTC

# Line 1 | Line 1
1 + /* Copyright (c) 1992 Regents of the University of California */
2 +
3   #ifndef lint
4 < static char SCCSid[] = "$SunId$ AU";
4 > static char SCCSid[] = "$SunId$ LBL";
5   #endif
6 < /*
7 <    rad2pict - Convert an Radiance image to APPLE pict format.
8 <        
9 <    School of Architecture, Auckland University, Private Bag
10 <    Auckland, New Zealand
11 < */
6 >
7 > /*              Convert an Radiance image to APPLE pict format.
8 > *
9 > *                      Orginally Iris to PICT by       Paul Haeberli - 1990
10 > *                      Hacked into Rad to PICT by Russell Street 1990
11 > *
12 > *      History:
13 > *          V 1                 -- Does basic conversion
14 > *          V 1.1 (2/11/91)     -- Added options for Gamma
15 > *                              -- verbose option
16 > *                              -- man page
17 > *                              -- better about allocating buffers
18 > *          V 1.2 (19/11/91)    -- Revised to handle opening "The Radiance Way"
19 > *                              -- Added exposure level adjustment
20 > */
21 >
22   #include <stdio.h>
23 < #include <stdlib.h>
23 > #ifdef MSDOS
24 > #include <fcntl.h>
25 > #endif
26 >
27   #include "pict.h"
28   #include "color.h"
29 + #include "resolu.h"
30  
31 < char cbuf[8192*5];
16 < char pbuf[8192];
17 < int outbytes;
18 < FILE *outf, *inf;
19 < char **gargv;
31 > extern char     *malloc();
32  
33 < putpic(int, int);
33 > int     outbytes;                   /* This had better be 32 bits! */
34 > char    *progname;
35 > int     verbose = 0;
36 > float   gamma = 2.0;
37 > int     bradj = 0;
38  
39 +        /* First some utility routines */
40 +
41   putrect(xorg,yorg,xsize,ysize)
42   int xorg, yorg, xsize, ysize;
43   {
# Line 55 | Line 73 | short s;
73   }
74  
75   putbyte(b)
76 < unsigned char b;
76 > int b;
77   {
78 <    char c[1];
79 <
62 <    c[0] = b;
63 <    if(!fwrite(c,1,1,outf)) {
64 <        fprintf(stderr,"%s: error on write\n", gargv[0]);
78 >    if (putc(b,stdout) == EOF && ferror(stdout)) {
79 >        fprintf(stderr,"%s: error on write\n", progname);
80          exit(1);
81      }
82      outbytes++;
# Line 71 | Line 86 | putbytes(buf,n)
86   unsigned char *buf;
87   int n;
88   {
89 <    if(!fwrite(buf,n,1,outf)) {
90 <        fprintf(stderr,"topict: error on write\n");
89 >    if(!fwrite(buf,n,1,stdout)) {
90 >        fprintf(stderr,"%s: error on write\n", progname);
91          exit(1);
92      }
93      outbytes+=n;
# Line 85 | Line 100 | char **argv;
100      int xsize, ysize;
101      int i, picsize;
102      int ssizepos, lsizepos;
103 + #ifdef MSDOS
104 +    extern int  _fmode;
105 +    _fmode = O_BINARY;
106 +    setmode(fileno(stdin), O_BINARY);
107 +    setmode(fileno(stdout), O_BINARY);
108 + #endif
109 +    progname = argv[0];
110  
111 <    gargv = argv;
111 >    for (i = 1; i < argc ; i++)
112 >        if (argv[i][0] ==  '-')
113 >            switch (argv[i][1]) {
114 >                case 'g':       gamma = atof(argv[++i]);
115 >                                break;
116  
117 <    if( argc<3 ) {
118 <        fprintf(stderr, "Usage: %s inimage out.pict\n", gargv[0]);
119 <        exit(1);
120 <    }
117 >                case 'e':       if (argv[i+1][0] != '+' && argv[i+1][0] != '-')
118 >                                   usage();
119 >                                else
120 >                                    bradj = atoi(argv[++i]);
121 >                                break;
122  
123 <    if( (inf=fopen(gargv[1],"rb")) == NULL ) {
124 <        fprintf(stderr,"%s: can't open input file %s\n",gargv[0], gargv[1]);
123 >                case 'v':       ;
124 >                                verbose = 1;
125 >                                break;
126 >
127 >                case 'r':       fprintf(stderr, "Sorry. Get a Macintosh :-)\n");
128 >                                exit(1);
129 >
130 >                case '-':       i++;
131 >                                goto outofparse;
132 >                                break;              /* NOTREACHED */
133 >
134 >                otherwise:      usage();
135 >                                break;
136 >                 }
137 >        else
138 >            break;
139 >
140 > outofparse:
141 >
142 >    if (i < argc - 2)
143 >        usage();
144 >
145 >    if (i <= argc - 1 && freopen(argv[i], "r", stdin) == NULL) {
146 >        fprintf(stderr, "%s: can not open input \"%s\"\n",
147 >            progname, argv[i]);
148          exit(1);
149      }
150  
151 <    if( (outf=fopen(gargv[2],"wb")) == NULL ) {
152 <        fprintf(stderr,"%s: can't open output file %s\n", gargv[0], gargv[1]);
151 >    if (i <= argc - 2 && freopen(argv[i+1], "w", stdout) == NULL) {
152 >        fprintf(stderr, "%s: can not open input \"%s\"\n",
153 >            progname, argv[i+1]);
154          exit(1);
155      }
156 +        
157 + #ifdef DEBUG
158 +        fprintf(stderr, "Input file: %s\n", i <= argc - 1 ? argv[i] : "stdin");
159 +        fprintf(stderr, "Outut file: %s\n", i <= argc - 2 ? argv[i+1] : "stdout" );
160 +        fprintf(stderr, "Gamma: %f\n", gamma);
161 +        fprintf(stderr, "Brightness adjust: %d\n", bradj);
162 +        fprintf(stderr, "Verbose: %s\n", verbose ? "on" : "off");
163 + #endif
164  
106 –    if (checkheader(inf, COLRFMT, NULL) < 0 ||
107 –            fgetresolu(&xsize, &ysize, inf) != (YMAJOR|YDECR)) {
108 –        fprintf(stderr, "%s: not a radiance picture\n", argv[1]);
109 –        exit(1);
110 –    }
165  
166 <    setcolrgam(2.0);
166 >             /* OK. Now we read the size of the Radiance picture */
167 >    if (checkheader(stdin, COLRFMT, NULL) < 0 ||
168 >            fgetresolu(&xsize, &ysize, stdin) < 0 /* != (YMAJOR|YDECR) */ ) {
169 >        fprintf(stderr, "%s: not a radiance picture\n", progname);
170 >        exit(1);
171 >        }
172  
173 +            /* Set the gamma correction */
174 +
175 +    setcolrgam(gamma);
176 +
177      for(i=0; i<HEADER_SIZE; i++)
178          putbyte(0);
179 +
180      ssizepos = outbytes;
181 <    putashort(0);               /* low 16 bits of file size less HEADER_SIZE */
181 >    putashort(0);               /* low 16 bits of file size less HEADER_SIZE */
182      putrect(0,0,xsize,ysize);   /* bounding box of picture */
183      putashort(PICT_picVersion);
184      putashort(0x02ff);          /* version 2 pict */
185      putashort(PICT_reservedHeader);     /* reserved header opcode */
186  
187      lsizepos = outbytes;
188 <    putalong(0);                /* full size of the file */
189 <    putfprect(0,0,xsize,ysize); /* fixed point bounding box of picture */
190 <    putalong(0);                /* reserved */
188 >    putalong(0);                /* full size of the file */
189 >    putfprect(0,0,xsize,ysize); /* fixed point bounding box of picture */
190 >    putalong(0);                /* reserved */
191  
192 <    putashort(PICT_clipRgn);    /* the clip region */
192 >    putashort(PICT_clipRgn);    /* the clip region */
193      putashort(10);
194      putrect(0,0,xsize,ysize);
195  
196 <    putpict(xsize, ysize);
196 >    if (verbose)
197 >        fprintf(stderr, "%s: The picture is %d by %d, with a gamma of %f\n",
198 >            progname, xsize, ysize, gamma);
199  
200 +
201 +    putpict(xsize, ysize);      /* Here is where all the work is done */
202 +
203      putashort(PICT_EndOfPicture); /* end of pict */
204  
205      picsize = outbytes-HEADER_SIZE;
206 <    fseek(outf,ssizepos,0);
206 >    fseek(stdout,ssizepos,0);
207      putashort(picsize&0xffff);
208 <    fseek(outf,lsizepos,0);
208 >    fseek(stdout,lsizepos,0);
209      putalong(picsize);
210  
211 <    fclose(outf);
211 >    fclose(stdout);
212 >    fclose(stdin);
213 >    
214      exit(0);
215 +    return 0;       /* lint fodder */
216   }
217  
218   putpict(xsize, ysize)
219   int xsize;
220   int ysize;
221   {
222 <    int y;
223 <    int nbytes, rowbytes;
222 >    int     y;
223 >    int     nbytes, rowbytes;
224 >    char    *cbuf, *pbuf;
225  
226 +    cbuf = malloc(4 * xsize);
227 +
228 +    if (cbuf == NULL) {
229 +        fprintf(stderr, "%s: not enough memory\n", progname);
230 +        exit(1);
231 +        }
232 +
233 +    pbuf = malloc(4 * xsize);
234 +
235 +    if (pbuf == NULL) {
236 +        fprintf(stderr, "%s: not enough memory\n", progname);
237 +        exit(1);
238 +        }
239 +
240      putashort(PICT_Pack32BitsRect); /* 32 bit rgb */
241      rowbytes = 4*xsize;
242      putalong(0x000000ff);               /* base address */
243  
244 +
245      if(rowbytes&1)
246          rowbytes++;
247 <    putashort(rowbytes|0x8000); /* rowbytes */
247 >    putashort(rowbytes|0x8000); /* rowbytes */
248      putrect(0,0,xsize,ysize);   /* bounds */
249      putashort(0);               /* version */
250  
# Line 169 | Line 257 | int ysize;
257      putashort(32);      /* pixelsize */
258      putashort(3);       /* cmpcount */
259  
260 +
261      putashort(8);       /* cmpsize */
262      putalong(0);        /* planebytes */
263      putalong(0);        /* pmtable */
264      putalong(0);        /* pmreserved */
265  
266 +
267      putrect(0,0,xsize,ysize);   /* scr rect */
268      putrect(0,0,xsize,ysize);   /* dest rect */
269  
270 +
271      putashort(0x40);    /* transfer mode */
272 +
273      for(y=0; y<ysize; y++) {
274 <        getrow(inf, cbuf, xsize);
274 >        getrow(stdin, cbuf, xsize);
275  
276          nbytes = packbits(cbuf,pbuf,24*xsize);
277          if(rowbytes>250)
# Line 187 | Line 279 | int ysize;
279          else
280              putbyte(nbytes);
281          putbytes(pbuf,nbytes);
282 <    }
282 >        }
283  
284      if(outbytes&1)
285          putbyte(0);
286 +
287 +    free(cbuf);
288 +    free(pbuf);
289   }
290  
291 < int getrow(FILE *in, char *mybuff, int xsize)
291 > int getrow(in, cbuf, xsize)
292 > FILE *in;
293 > char *cbuf;
294 > int xsize;
295   {
296 <    COLOR    color;
297 <    COLR    *scanin = (COLR*) malloc(xsize * sizeof(COLR));
296 >    extern char *tempbuffer();          /* defined in color.c */
297 >    COLR    *scanin = NULL;
298      int     x;
299  
300 <    if (scanin == NULL) {
301 <        printf("scanin null");
300 >    if ((scanin = (COLR *)tempbuffer(xsize*sizeof(COLR))) == NULL) {
301 >        fprintf(stderr, "%s: not enough memory\n", progname);
302 >        exit(1);
303      }
304  
206 –
305      if (freadcolrs(scanin, xsize, in) < 0) {
306 <        fprintf(stderr, " read error\n");
307 <        exit(1);
308 <    }
306 >        fprintf(stderr, "%s: read error\n", progname);
307 >        exit(1);
308 >        }
309  
310 <    colrs_gambs(scanin, xsize);
310 >    if (bradj)      /* Adjust exposure level */
311 >        shiftcolrs(scanin, xsize, bradj);
312 >
313 >
314 >    colrs_gambs(scanin, xsize);     /* Gamma correct it */
315      
316      for (x = 0; x < xsize; x++) {
317 <        colr_color(color, scanin[x]);
318 <        cbuf[xsize * 0 + x] = color[RED] * 255;
319 <        cbuf[xsize * 1 + x] = color[GRN] * 255;
320 <        cbuf[xsize * 2 + x] = color[BLU] * 255;
321 <    }
220 <    free(scanin);
317 >        cbuf[x] = scanin[x][RED];
318 >        cbuf[xsize + x] = scanin[x][GRN];
319 >        cbuf[2*xsize + x] = scanin[x][BLU];
320 >        }
321 >
322   }
323  
324 +
325   packbits(ibits,pbits,nbits)
326   unsigned char *ibits, *pbits;
327   int nbits;
328   {
329 <    int bytes;
329 >    int bytes;                      /* UNUSED */
330      unsigned char *sptr;
331      unsigned char *ibitsend;
332      unsigned char *optr = pbits;
# Line 232 | Line 334 | int nbits;
334  
335      nbytes = ((nbits-1)/8)+1;
336      ibitsend = ibits+nbytes;
337 <    while (ibits<ibitsend) {
337 >    while(ibits<ibitsend) {
338          sptr = ibits;
339          ibits += 2;
340          while((ibits<ibitsend)&&((ibits[-2]!=ibits[-1])||(ibits[-1]!=ibits[0])))
341              ibits++;
342 <        if(ibits != ibitsend) {
342 >        if(ibits != ibitsend) {
343              ibits -= 2;
344          }
345          count = ibits-sptr;
# Line 263 | Line 365 | int nbits;
365          }
366      }
367      return optr-pbits;
368 + }
369 +
370 + usage()
371 + {
372 +    fprintf(stderr, "Usage: %s [-v] [-g gamma] [infile [outfile]]\n",
373 +        progname);
374 +    exit(2);
375   }

Diff Legend

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