ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/SDL/video_sdl.cpp
(Generate patch)

Comparing BasiliskII/src/SDL/video_sdl.cpp (file contents):
Revision 1.9 by gbeauche, 2004-06-27T17:31:21Z vs.
Revision 1.10 by gbeauche, 2004-06-29T21:50:22Z

# Line 413 | Line 413 | static void add_mode(int type, int width
413          VIDEO_MODE_Y = height;
414          VIDEO_MODE_RESOLUTION = resolution_id;
415          VIDEO_MODE_ROW_BYTES = bytes_per_row;
416 <        VIDEO_MODE_DEPTH = depth;
416 >        VIDEO_MODE_DEPTH = (video_depth)depth;
417          VideoModes.push_back(mode);
418   }
419  
# Line 587 | Line 587 | void driver_base::update_palette(void)
587   {
588          const VIDEO_MODE &mode = monitor.get_current_mode();
589  
590 <        if (VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT)
590 >        if ((int)VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT)
591                  SDL_SetPalette(s, SDL_PHYSPAL, sdl_palette, 0, 256);
592   }
593  
# Line 618 | Line 618 | driver_window::driver_window(SDL_monitor
618          ADBSetRelMouseMode(mouse_grabbed);
619  
620          // Create surface
621 <        int depth = (VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT ? 8 : screen_depth);
621 >        int depth = ((int)VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT ? 8 : screen_depth);
622          if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE)) == NULL)
623                  return;
624  
# Line 1147 | Line 1147 | void SDL_monitor_desc::set_palette(uint8
1147          const VIDEO_MODE &mode = get_current_mode();
1148  
1149          // FIXME: how can we handle the gamma ramp?
1150 <        if (VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
1150 >        if ((int)VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
1151                  return;
1152  
1153          LOCK_PALETTE;
# Line 1962 | Line 1962 | static void update_display_static(driver
1962  
1963          // Check for first column from left and first column from right that have changed
1964          if (high) {
1965 <                if (VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
1965 >                if ((int)VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
1966                          const int src_bytes_per_row = bytes_per_row;
1967                          const int dst_bytes_per_row = drv->s->pitch;
1968                          const int pixels_per_byte = VIDEO_MODE_X / src_bytes_per_row;

Diff Legend

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