ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/include/video.h
(Generate patch)

Comparing BasiliskII/src/include/video.h (file contents):
Revision 1.9 by cebix, 2001-07-01T00:46:38Z vs.
Revision 1.11 by cebix, 2001-07-01T21:09:30Z

# Line 23 | Line 23
23  
24   #include <vector>
25  
26 + #ifndef NO_STD_NAMESPACE
27 + using std::vector;
28 + #endif
29 +
30   /*
31     Some of the terminology here is completely frelled. In Basilisk II, a
32     "video mode" refers to a combination of resolution and color depth, and
# Line 95 | Line 99 | inline uint32 TrivialBytesPerRow(uint32
99                  case VDEPTH_8BIT: return width;
100                  case VDEPTH_16BIT: return width * 2;
101                  case VDEPTH_32BIT: return width * 4;
102 +                default: return width;
103          }
104   }
105  
# Line 141 | Line 146 | inline bool IsDirectMode(const video_mod
146   }
147  
148   // List of all supported video modes
149 < extern std::vector<video_mode> VideoModes;
149 > extern vector<video_mode> VideoModes;
150  
151   // Description for one (possibly virtual) monitor
152   struct monitor_desc {
# Line 170 | Line 175 | extern void video_switch_to_mode(const v
175  
176   // Called by the video driver to set the color palette (in indexed modes)
177   // or gamma table (in direct modes)
178 < extern void video_set_palette(uint8 *pal);
178 > extern void video_set_palette(uint8 *pal, int num);
179  
180   #endif

Diff Legend

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