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

Comparing ray/src/rt/vga.c (file contents):
Revision 2.6 by greg, Fri Jun 4 14:49:08 1993 UTC vs.
Revision 2.7 by gregl, Tue Nov 11 20:03:01 1997 UTC

# Line 8 | Line 8 | static char SCCSid[] = "$SunId$ LBL";
8   *  vga.c - driver for VGA graphics adaptor under MS-DOS
9   */
10  
11 < #include  <stdio.h>
11 > #include  "standard.h"
12  
13 #include  <math.h>
14
13   #include  <graph.h>
14  
15   #include  "driver.h"
# Line 52 | Line 50 | char  *name, *id;
50                          break;
51          if (*mp == -1) {
52                  _setvideomode(_DEFAULTMODE);
53 <                stderr_v(name);
54 <                stderr_v(": card not present or insufficient VGA memory\n");
53 >                eputs(name);
54 >                eputs(": card not present or insufficient VGA memory\n");
55                  return(NULL);
56          }
57          _getvideoconfig(&config);
# Line 78 | Line 76 | char  *name, *id;
76          _remappalette(1, _BRIGHTWHITE);
77          _settextcolor(1);
78          ms_gcinit(&vga_driver);
79 <        errvec = vga_errout;
80 <        cmdvec = vga_comout;
81 <        if (wrnvec != NULL)
82 <                wrnvec = vga_comout;
79 >        erract[USER].pf =
80 >        erract[SYSTEM].pf =
81 >        erract[INTERNAL].pf =
82 >        erract[CONSISTENCY].pf = vga_errout;
83 >        erract[COMMAND].pf = vga_comout;
84 >        if (erract[WARNING].pf != NULL)
85 >                erract[WARNING].pf = vga_comout;
86          return(&vga_driver);
87   }
88  
# Line 91 | Line 92 | vga_close()                                    /* close VGA */
92   {
93          ms_gcdone(&vga_driver);
94          _setvideomode(_DEFAULTMODE);
95 <        errvec = stderr_v;                      /* reset error vectors */
96 <        cmdvec = NULL;
97 <        if (wrnvec != NULL)
98 <                wrnvec = stderr_v;
95 >        erract[USER].pf =                       /* reset error vector */
96 >        erract[SYSTEM].pf =
97 >        erract[INTERNAL].pf =
98 >        erract[CONSISTENCY].pf = eputs;
99 >        erract[COMMAND].pf = NULL;
100 >        if (erract[WARNING].pf != NULL)
101 >                erract[WARNING].pf = wputs;
102          if (fatalerr[0])
103 <                stderr_v(fatalerr);             /* repeat error message */
103 >                eputs(fatalerr);                /* repeat error message */
104   }
105  
106  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines