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

Comparing ray/src/px/pcompos.c (file contents):
Revision 2.21 by greg, Sat Feb 22 02:07:27 2003 UTC vs.
Revision 2.27 by schorsch, Fri Jan 2 12:47:01 2004 UTC

# Line 8 | Line 8 | static const char      RCSid[] = "$Id$";
8   */
9  
10   #include  <stdio.h>
11
11   #include  <math.h>
13
14 #ifdef MSDOS
15 #include  <fcntl.h>
16 #endif
17
12   #include  <time.h>
13 + #include  <string.h>
14  
15 < #include  "color.h"
15 > #include "copyright.h"
16  
17 + #include  "platform.h"
18 + #include  "rtprocess.h"
19 + #include  "color.h"
20   #include  "resolu.h"
21  
22   #define  MAXFILE        64
# Line 63 | Line 61 | int  wrongformat = 0;
61   FILE  *lblopen();
62   void  quit();
63  
64 + static gethfunc tabputs;
65  
66 < tabputs(s)                      /* print line preceded by a tab */
67 < char  *s;
66 >
67 > static int
68 > tabputs(                        /* print line preceded by a tab */
69 >        char    *s,
70 >        void    *p
71 > )
72   {
73          char  fmt[32];
74  
# Line 95 | Line 98 | char  *argv[];
98          int  xsgn, ysgn;
99          char  *thislabel;
100          int  an;
101 < #ifdef MSDOS
102 <        extern int  _fmode;
103 <        _fmode = O_BINARY;
101 <        setmode(fileno(stdin), O_BINARY);
102 <        setmode(fileno(stdout), O_BINARY);
103 < #endif
101 >        SET_DEFAULT_BINARY();
102 >        SET_FILE_BINARY(stdin);
103 >        SET_FILE_BINARY(stdout);
104          progname = argv[0];
105  
106          for (an = 1; an < argc && argv[an][0] == '-'; an++)
# Line 387 | Line 387 | register COLR  c1, c2;
387  
388          j = 4;                          /* check exponents first! */
389          while (j--)
390 <                if (i = c1[j] - c2[j])
390 >                if ( (i = c1[j] - c2[j]) )
391                          return(i);
392          return(0);
393   }
# Line 398 | Line 398 | lblopen(s, xp, yp)             /* open pipe to label generator */
398   char  *s;
399   int  *xp, *yp;
400   {
401 <        char  com[128];
401 >        char  com[PATH_MAX];
402          FILE  *fp;
403  
404          sprintf(com, "psign -s -.15 -a 2 -x %d -y %d '%.90s'", *xp, *yp, s);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines