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

Comparing ray/src/px/pfilt.c (file contents):
Revision 2.24 by schorsch, Sun Jun 8 12:03:10 2003 UTC vs.
Revision 2.27 by greg, Wed Oct 22 02:06:35 2003 UTC

# Line 8 | Line 8 | static const char RCSid[] = "$Id$";
8   *     6/23/93  Added additional buffers for value spreading
9   */
10  
11 + #include  "copyright.h"
12 +
13   #include  <signal.h>
14 + #include  <string.h>
15  
13 – #include  "standard.h"
16   #include  "platform.h"
17 + #include  "standard.h"
18   #include  "color.h"
19   #include  "view.h"
20   #include  "paths.h"
# Line 487 | Line 490 | scan2init()                    /* prepare scanline arrays */
490          if (obarsize > 0) {
491                  scoutbar = (COLOR **)malloc(obarsize*sizeof(COLOR *));
492                  greybar = (float **)malloc(obarsize*sizeof(float *));
493 <                if (scoutbar == NULL | greybar == NULL)
493 >                if ((scoutbar == NULL) | (greybar == NULL))
494                          goto memerr;
495                  for (i = 0; i < obarsize; i++) {
496                          scoutbar[i] = (COLOR *)malloc(ncols*sizeof(COLOR));
497                          greybar[i] = (float *)malloc(ncols*sizeof(float));
498 <                        if (scoutbar[i] == NULL | greybar[i] == NULL)
498 >                        if ((scoutbar[i] == NULL) | (greybar[i] == NULL))
499                                  goto memerr;
500                  }
501          } else {
# Line 541 | Line 544 | int  r;
544                          greybar[nextrow%obarsize][c] = (*ourbright)(ctmp);
545                  }
546                                          /* and zero output scanline */
547 <                bzero((char *)scoutbar[nextrow%obarsize], ncols*sizeof(COLOR));
547 >                memset((char *)scoutbar[nextrow%obarsize], '\0', ncols*sizeof(COLOR));
548                  nextrow++;
549          }
550                                          /* point to top scanline for output */

Diff Legend

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