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.17 by greg, Thu Apr 14 04:53:54 1994 UTC vs.
Revision 2.21 by greg, Sat Jun 21 15:05:01 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   *  psign.c - produce picture from text.
6   *
# Line 11 | Line 8 | static char SCCSid[] = "$SunId$ LBL";
8   */
9  
10   #include  "standard.h"
11 <
11 > #include  "platform.h"
12   #include  "color.h"
16 –
13   #include  "font.h"
14  
15   #ifndef  SSS
# Line 38 | Line 34 | unsigned char  *ourbitmap;             /* our output bitmap */
34   int  xsiz, ysiz;                        /* bitmap dimensions */
35   int  xdim;                              /* size of horizontal scan (bytes) */
36  
37 +                                /* conflicting def's in param.h */
38 + #undef  tstbit
39 + #undef  setbit
40 + #undef  clrbit
41 + #undef  tglbit
42 +
43   #define  bitop(x,y,op)          (ourbitmap[(y)*xdim+((x)>>3)] op (1<<((x)&7)))
44   #define  tstbit(x,y)            bitop(x,y,&)
45   #define  setbit(x,y)            bitop(x,y,|=)
# Line 62 | Line 64 | int  argc;
64   char  *argv[];
65   {
66          int  an;
67 < #ifdef MSDOS
66 <        setmode(fileno(stdout), O_BINARY);
67 < #endif
67 >        SET_FILE_BINARY(stdout);
68          for (an = 1; an < argc && argv[an][0] == '-'; an++)
69                  switch (argv[an][1]) {
70                  case 'c':                       /* color */
# Line 223 | Line 223 | FILE  *fp;
223                  if (curl == NULL)
224                          goto memerr;
225                  len = strlen(buf);
226 <                curl->s = malloc(len);
226 >                curl->s = (char *)malloc(len);
227                  curl->sp = (short *)malloc(sizeof(short)*len--);
228                  if (curl->s == NULL | curl->sp == NULL)
229                          goto memerr;
# Line 260 | Line 260 | char  *av[];
260          ourtext = (LINE *)malloc(sizeof(LINE));
261          if (ourtext == NULL)
262                  goto memerr;
263 <        ourtext->s = malloc(MAXLINE);
263 >        ourtext->s = (char *)malloc(MAXLINE);
264          if (ourtext->s == NULL)
265                  goto memerr;
266          for (cp = ourtext->s; ac-- > 0; av++) {
# Line 438 | Line 438 | FILE  *fp;
438                          exit(1);
439                  }
440          }
441 <        free((char *)scanout);
441 >        free((void *)scanout);
442   }

Diff Legend

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