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.3 by greg, Tue Jan 16 09:11:40 1990 UTC vs.
Revision 1.4 by greg, Mon Nov 11 14:01:21 1991 UTC

# Line 1 | Line 1
1 + /* Copyright (c) 1991 Regents of the University of California */
2 +
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ LBL";
5   #endif
6  
5 /* Copyright 1989 Regents of the University of California */
6
7 #ifndef lint
8 static char SCCSid[] = "@(#)ra_pixar.c 1.2 9/12/89 LBL";
9 #endif
10
7   /* ra_pixar.c */
8   /*
9   * convert from RADIANCE image file to PIXAR image file.  (or vice versa)
# Line 36 | Line 32 | static char SCCSid[] = "@(#)ra_pixar.c 1.2 9/12/89 LBL
32   #ifdef undef
33   #include "color.h"
34   #else
39 #define                 XDECR                   1
40 #define                 YDECR                   2
41 #define                 YMAJOR                  4
42
35   #define                 RED                     0
36   #define                 GRN                     1
37   #define                 BLU                     2
# Line 49 | Line 41 | static char SCCSid[] = "@(#)ra_pixar.c 1.2 9/12/89 LBL
41          ((col)[RED]=(r),(col)[GRN]=(g),(col)[BLU]=(b))
42   typedef float  COLOR[3];        /* red, green, blue */
43   #endif
44 + #include "resolu.h"
45  
46  
47   char                    *ProgramName;
# Line 170 | Line 163 | int            *h;
163        exit(1);
164     }
165     getheader(radiance_fp,NULL);
166 <   if (fgetresolu(w, h, radiance_fp) != (YMAJOR|YDECR))
166 >   if (fgetresolu(w, h, radiance_fp) < 0)
167     {
168        fprintf(stderr,"bad RADIANCE format\n");
169        exit(1);
# Line 277 | Line 270 | int            y;
270   {
271     printargs(global_argc,global_argv,fp);
272     fputc('\n',fp);
273 <   fputresolu(YMAJOR|YDECR, x, y, fp);
273 >   fprtresolu(x, y, fp);
274     fflush(fp);
275   }
276  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines