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

Comparing ray/src/px/pflip.c (file contents):
Revision 2.4 by greg, Mon Oct 16 11:40:11 1995 UTC vs.
Revision 2.9 by greg, Tue Aug 8 18:04:41 2006 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   * flip picture file horizontally and/or vertically
6   */
7  
8   #include <stdio.h>
9 + #include  <time.h>
10 + #include  <string.h>
11  
12 < #ifdef MSDOS
14 < #include  <fcntl.h>
15 < #endif
16 <
12 > #include "platform.h"
13   #include "color.h"
18 –
14   #include "resolu.h"
15  
16   int     order;                          /* input orientation */
# Line 31 | Line 26 | FILE   *fin;                           /* input file */
26  
27   char    *progname;
28  
34 – extern char     *malloc();
29  
30 + static void memerr(void);
31 + static void scanfile(void);
32 + static void flip(void);
33  
34 < int
35 < neworder()                      /* figure out new order from old */
34 >
35 > static int
36 > neworder(void)                  /* figure out new order from old */
37   {
38          register int  no;
39  
# Line 51 | Line 49 | neworder()                     /* figure out new order from old */
49          return(no);
50   }
51  
52 <
53 < main(argc, argv)
54 < int     argc;
55 < char    *argv[];
52 > int
53 > main(
54 >        int     argc,
55 >        char    *argv[]
56 > )
57   {
58          static char     picfmt[LPICFMT+1] = PICFMT;
59          int     i, rval;
60 < #ifdef MSDOS
61 <        extern int  _fmode;
63 <        _fmode = O_BINARY;
64 <        setmode(fileno(stdout), O_BINARY);
65 < #endif
60 >        SET_DEFAULT_BINARY();
61 >        SET_FILE_BINARY(stdout);
62          progname = argv[0];
63  
64          for (i = 1; i < argc; i++)
# Line 80 | Line 76 | char   *argv[];
76                  exit(1);
77          }
78          if ((fin = fopen(argv[i], "r")) == NULL) {
79 <                fprintf(stderr, "%s: cannot open\n", argv[1]);
79 >                fprintf(stderr, "%s: cannot open\n", argv[i]);
80                  exit(1);
81          }
82          if (i < argc-1 && freopen(argv[i+1], "w", stdout) == NULL) {
# Line 113 | Line 109 | char   *argv[];
109   }
110  
111  
112 < memerr()
112 > static void
113 > memerr(void)
114   {
115          fprintf(stderr, "%s: out of memory\n", progname);
116          exit(1);
117   }
118  
119  
120 < scanfile()                              /* scan to the end of file */
120 > static void
121 > scanfile(void)                          /* scan to the end of file */
122   {
123          extern long     ftell();
124          COLR    *scanin;
# Line 138 | Line 136 | scanfile()                             /* scan to the end of file */
136                  }
137          }
138          scanpos[0] = ftell(fin);
139 <        free((char *)scanin);
139 >        free((void *)scanin);
140   }
141  
142  
143 < flip()                                  /* flip the picture */
143 > static void
144 > flip(void)                                      /* flip the picture */
145   {
146          COLR    *scanin, *scanout;
147          int     y;
# Line 172 | Line 171 | flip()                                 /* flip the picture */
171                          exit(1);
172                  }
173          }
174 <        free((char *)scanin);
174 >        free((void *)scanin);
175          if (fhoriz)
176 <                free((char *)scanout);
176 >                free((void *)scanout);
177   }

Diff Legend

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