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

Comparing ray/src/rt/rv2.c (file contents):
Revision 1.26 by greg, Mon Aug 26 10:12:02 1991 UTC vs.
Revision 1.29 by greg, Fri Oct 11 12:12:40 1991 UTC

# Line 22 | Line 22 | static char SCCSid[] = "$SunId$ LBL";
22  
23   #define  CTRL(c)        ('c'-'@')
24  
25 + extern char  VersionID[];
26   extern char  *progname;
27 + extern char  *octname;
28  
29  
30   getframe(s)                             /* get a new frame */
# Line 564 | Line 566 | char  *s;
566                                                  /* write header */
567          fputs(progname, fp);
568          fprintview(&ourview, fp);
569 <        putc('\n', fp);
569 >        if (octname != NULL)
570 >                fprintf(fp, " %s\n", octname);
571 >        else
572 >                putc('\n', fp);
573 >        fprintf(fp, "SOFTWARE= %s\n", VersionID);
574          if (exposure != 1.0)
575                  fputexpos(exposure, fp);
576          if (dev->pixaspect != 1.0)
# Line 574 | Line 580 | char  *s;
580          fputresolu(YMAJOR|YDECR, hresolu, vresolu, fp);
581  
582          scanline = (COLR *)malloc(hresolu*sizeof(COLR));
583 <        if (scanline == NULL)
584 <                error(SYSTEM, "out of memory in writepict");
583 >        if (scanline == NULL) {
584 >                error(COMMAND, "not enough memory!");
585 >                fclose(fp);
586 >                unlink(fname);
587 >                return;
588 >        }
589          for (y = vresolu-1; y >= 0; y--) {
590                  getpictcolrs(y, scanline, &ptrunk, hresolu, vresolu);
591                  if (fwritecolrs(scanline, hresolu, fp) < 0)
592                          break;
593          }
594 +        free((char *)scanline);
595          if (fclose(fp) < 0)
596                  error(COMMAND, "write error");
586        free((char *)scanline);
597   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines