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

Comparing ray/src/px/ra_pixar.c (file contents):
Revision 1.1 by greg, Mon Jul 24 08:42:56 1989 UTC vs.
Revision 2.2 by greg, Sat Feb 22 02:07:27 2003 UTC

# Line 1 | Line 1
1 /* Copyright 1989 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   /* ra_pixar.c */
5   /*
6   * convert from RADIANCE image file to PIXAR image file.  (or vice versa)
# Line 22 | Line 19 | static char SCCSid[] = "$SunId$ LBL";
19  
20   #include <stdio.h>
21   #include <math.h>
22 + #include  <time.h>
23  
24   /* PIXAR */
25   #include <picio.h>
# Line 41 | Line 39 | static char SCCSid[] = "$SunId$ LBL";
39          ((col)[RED]=(r),(col)[GRN]=(g),(col)[BLU]=(b))
40   typedef float  COLOR[3];        /* red, green, blue */
41   #endif
42 + #include "resolu.h"
43  
44  
45   char                    *ProgramName;
# Line 162 | Line 161 | int            *h;
161        exit(1);
162     }
163     getheader(radiance_fp,NULL);
164 <   if (fscanf(radiance_fp,"-Y %d +X %d\n",h,w) != 2)
164 >   if (fgetresolu(w, h, radiance_fp) < 0)
165     {
166        fprintf(stderr,"bad RADIANCE format\n");
167        exit(1);
# Line 269 | Line 268 | int            y;
268   {
269     printargs(global_argc,global_argv,fp);
270     fputc('\n',fp);
271 <   fprintf(fp,"-Y %d +X %d\n",y,x);
271 >   fprtresolu(x, y, fp);
272     fflush(fp);
273   }
274  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines