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

Comparing ray/src/px/ra_rgbe.c (file contents):
Revision 2.8 by gregl, Fri Jan 23 11:38:39 1998 UTC vs.
Revision 2.14 by schorsch, Mon Oct 27 10:24:51 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1992 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   /*
5   *  program to convert from RADIANCE RLE to flat format
6   */
7  
8   #include  <stdio.h>
9   #include  <math.h>
10 + #include  <time.h>
11 + #include  <string.h>
12 +
13 + #include  "platform.h"
14 + #include  "rtprocess.h"
15   #include  "color.h"
16   #include  "resolu.h"
17  
16 – #ifdef MSDOS
17 – #include  <fcntl.h>
18 – #endif
19 –
20 – extern char     *malloc(), *realloc(), *tempbuffer();
18   extern int      addhline();
19  
20   #define dumpheader(fp)  fwrite(headlines, 1, headlen, fp)
# Line 80 | Line 77 | gotfile:
77                                  progname, argv[i]);
78                  exit(1);
79          }
80 < #ifdef MSDOS
84 <        setmode(fileno(stdin), O_BINARY);
85 < #endif
80 >        SET_FILE_BINARY(stdin);
81          ospec = i==argc-2 ? argv[i+1] : (char *)NULL;
82          while (transfer(ospec))
83                  ;
# Line 157 | Line 152 | char   *ospec;
152                          }
153                  }
154          }
155 < #ifdef MSDOS
161 <        setmode(fileno(fp), O_BINARY);
162 < #endif
155 >        SET_FILE_BINARY(fp);
156          dumpheader(fp);                 /* put out header */
157          fputs(progname, fp);
158          if (bradj)
# Line 199 | Line 192 | char   *ospec;
192   }
193  
194  
195 + int
196   addhline(s)                     /* add a line to our info. header */
197   char    *s;
198   {
# Line 211 | Line 205 | char   *s;
205                  frameno = atoi(s+6);
206          n = strlen(s);
207          if (headlen)
208 <                headlines = (char *)realloc(headlines, headlen+n+1);
208 >                headlines = (char *)realloc((void *)headlines, headlen+n+1);
209          else
210                  headlines = (char *)malloc(n+1);
211          if (headlines == NULL) {
# Line 220 | Line 214 | char   *s;
214          }
215          strcpy(headlines+headlen, s);
216          headlen += n;
217 +        return(0);
218   }
219  
220  

Diff Legend

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