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

Comparing ray/src/px/normtiff.c (file contents):
Revision 3.7 by schorsch, Fri Jan 2 11:42:37 2004 UTC vs.
Revision 3.11 by greg, Mon Nov 10 19:08:19 2008 UTC

# Line 13 | Line 13 | static const char      RCSid[] = "$Id$";
13   #include "tiffio.h"
14   #include "color.h"
15   #include "tonemap.h"
16 + #include "tmaptiff.h"
17   #include "resolu.h"
18  
19  
# Line 42 | Line 43 | typedef struct {
43          RESOLU  rs;             /* picture resolution */
44   } PICTURE;
45  
46 < extern PICTURE  *openpicture();
46 > uint16  comp = COMPRESSION_NONE;        /* TIFF compression mode */
47  
48   #define closepicture(p)         (fclose((p)->fp),free((void *)(p)))
49  
50   static gethfunc headline;
51  
52 + static int headline(char *s, void *pp);
53 + static PICTURE *openpicture(char *fname);
54 + static int tmap_picture(char *fname, PICTURE *pp);
55 + static int tmap_tiff(char *fname, TIFF *tp);
56 + static int putimage(uint16 or, uint32 xs, uint32 ys, float xr, float yr,
57 +        uint16 ru, BYTE *pd);
58  
59 +
60   int
61   main(
62          int     argc,
# Line 88 | Line 96 | main(
96                          if (argc-i < 2) goto userr;
97                          lddyn = atof(argv[++i]);
98                          break;
99 +                case 'z':                       /* LZW compression */
100 +                        comp = COMPRESSION_LZW;
101 +                        break;
102                  case 'p':                       /* set display primaries */
103                          if (argc-i < 9) goto userr;
104                          myprims[RED][CIEX] = atof(argv[++i]);
# Line 126 | Line 137 | main(
137          exit(rval==0 ? 0 : 1);
138   userr:
139          fprintf(stderr,
140 < "Usage: %s [-h][-s][-c][-l][-b][-g gv][-d ld][-u lm][-p xr yr xg yg xb yb xw yw] input.{tif|pic} output.tif\n",
140 > "Usage: %s [-h][-s][-c][-l][-b][-g gv][-d ld][-u lm][-z][-p xr yr xg yg xb yb xw yw] input.{tif|hdr} output.tif\n",
141                          argv[0]);
142          exit(1);
143   }
# Line 151 | Line 162 | headline(                              /* process line from header */
162   }
163  
164  
165 < PICTURE *
166 < openpicture(fname)                      /* open/check Radiance picture file */
167 < char    *fname;
165 > static PICTURE *
166 > openpicture(                    /* open/check Radiance picture file */
167 >        char    *fname
168 > )
169   {
170          FILE    *fp;
171          register PICTURE        *pp;
# Line 192 | Line 204 | char   *fname;
204   }
205  
206  
207 < int
208 < tmap_picture(fname, pp)                 /* tone map Radiance picture */
209 < char    *fname;
210 < register PICTURE        *pp;
207 > static int
208 > tmap_picture(                   /* tone map Radiance picture */
209 >        char    *fname,
210 >        register PICTURE        *pp
211 > )
212   {
213          uint16  orient;
214 +        double  paspect = (pp->rs.rt & YMAJOR) ? pp->pa : 1./pp->pa;
215          int     xsiz, ysiz;
216          BYTE    *pix;
217                                          /* read and tone map picture */
# Line 211 | Line 225 | register PICTURE       *pp;
225          orient++;
226                                          /* put out our image */
227          if (putimage(orient, (uint32)xsiz, (uint32)ysiz,
228 <                        72., 72./pp->pa, 2, pix) != 0)
228 >                        72., 72./paspect, 2, pix) != 0)
229                  return(-1);
230                                          /* free data and we're done */
231          free((void *)pix);
# Line 219 | Line 233 | register PICTURE       *pp;
233   }
234  
235  
236 < tmap_tiff(fname, tp)                    /* tone map SGILOG TIFF */
237 < char    *fname;
238 < TIFF    *tp;
236 > static int
237 > tmap_tiff(                      /* tone map SGILOG TIFF */
238 >        char    *fname,
239 >        TIFF    *tp
240 > )
241   {
242          float   xres, yres;
243          uint16  orient, resunit, phot;
# Line 250 | Line 266 | TIFF   *tp;
266   }
267  
268  
269 < putimage(or, xs, ys, xr, yr, ru, pd)    /* write out our image */
270 < uint16  or;
271 < uint32  xs, ys;
272 < float   xr, yr;
273 < uint16 ru;
274 < BYTE    *pd;
269 > static int
270 > putimage(       /* write out our image */
271 >        uint16  or,
272 >        uint32  xs,
273 >        uint32  ys,
274 >        float   xr,
275 >        float   yr,
276 >        uint16  ru,
277 >        BYTE    *pd
278 > )
279   {
280          register int    y;
281          uint32  rowsperstrip;
# Line 278 | Line 298 | BYTE   *pd;
298          TIFFSetField(tifout, TIFFTAG_IMAGEWIDTH, xs);
299          TIFFSetField(tifout, TIFFTAG_IMAGELENGTH, ys);
300          TIFFSetField(tifout, TIFFTAG_RESOLUTIONUNIT, ru);
301 +        TIFFSetField(tifout, TIFFTAG_COMPRESSION, comp);
302          TIFFSetField(tifout, TIFFTAG_XRESOLUTION, xr);
303          TIFFSetField(tifout, TIFFTAG_YRESOLUTION, yr);
304          TIFFSetField(tifout, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);

Diff Legend

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