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

Comparing ray/src/px/psign.c (file contents):
Revision 2.18 by greg, Sat Feb 22 02:07:27 2003 UTC vs.
Revision 2.24 by greg, Wed Oct 22 02:06:35 2003 UTC

# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7   *      7/1/87
8   */
9  
10 < #include  "standard.h"
10 > #include  "copyright.h"
11  
12 < #include  "color.h"
12 > #include  <string.h>
13  
14 + #include  "platform.h"
15 + #include  "standard.h"
16 + #include  "color.h"
17   #include  "font.h"
18  
19   #ifndef  SSS
# Line 35 | Line 38 | unsigned char  *ourbitmap;             /* our output bitmap */
38   int  xsiz, ysiz;                        /* bitmap dimensions */
39   int  xdim;                              /* size of horizontal scan (bytes) */
40  
41 +                                /* conflicting def's in param.h */
42 + #undef  tstbit
43 + #undef  setbit
44 + #undef  clrbit
45 + #undef  tglbit
46 +
47   #define  bitop(x,y,op)          (ourbitmap[(y)*xdim+((x)>>3)] op (1<<((x)&7)))
48   #define  tstbit(x,y)            bitop(x,y,&)
49   #define  setbit(x,y)            bitop(x,y,|=)
# Line 59 | Line 68 | int  argc;
68   char  *argv[];
69   {
70          int  an;
71 < #ifdef MSDOS
63 <        setmode(fileno(stdout), O_BINARY);
64 < #endif
71 >        SET_FILE_BINARY(stdout);
72          for (an = 1; an < argc && argv[an][0] == '-'; an++)
73                  switch (argv[an][1]) {
74                  case 'c':                       /* color */
# Line 201 | Line 208 | makemap()                      /* create the bit map */
208          ourbitmap = (BYTE *)bmalloc(ysiz*xdim);
209          if (ourbitmap == NULL)
210                  error(SYSTEM, "Out of memory in makemap");
211 <        bzero((char *)ourbitmap, ysiz*xdim);
211 >        memset((char *)ourbitmap, '\0', ysiz*xdim);
212   }
213  
214  
# Line 222 | Line 229 | FILE  *fp;
229                  len = strlen(buf);
230                  curl->s = (char *)malloc(len);
231                  curl->sp = (short *)malloc(sizeof(short)*len--);
232 <                if (curl->s == NULL | curl->sp == NULL)
232 >                if ((curl->s == NULL) | (curl->sp == NULL))
233                          goto memerr;
234                  if (len > maxline)
235                          maxline = len;

Diff Legend

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