mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix serious color bug in UpdateScreen. Because it considered newBits

Browse Source 
to be signed instead of unsigned, it was looking up color values
  like wxBochsPalette[-126] instead of wxBochsPalette[130].  This affected
  any colors in the palette between 128 and 255.  I simply hanged newBits
  to signed, and it fixed bug #618462: wx: 256 color modes not working properly
- I am still not satisfied with the way that wxWindows maps colors on an
  8-bit display, but that is a different issue.
This commit is contained in:
Bryce Denney 2002-10-05 18:15:00 +00:00
parent b147067051
commit f5e351f12d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bochs/gui/wx.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////
// $Id: wx.cc,v 1.39 2002-10-05 17:45:48 bdenney Exp $
// $Id: wx.cc,v 1.40 2002-10-05 18:15:00 bdenney Exp $
/////////////////////////////////////////////////////////////////
//
// wxWindows VGA display for Bochs. wx.cc implements a custom
@ -834,7 +834,7 @@ bx_gui_c::clear_screen(void)
}
static void
UpdateScreen(char *newBits, int x, int y, int width, int height)
UpdateScreen(unsigned char *newBits, int x, int y, int width, int height)
{
IFDBG_VGA(wxLogDebug ("MyPanel::UpdateScreen trying to get lock. wxScreen=%p", wxScreen));
wxCriticalSectionLocker lock(wxScreen_lock);
@ -866,7 +866,7 @@ DrawBochsBitmap(int x, int y, int width, int height, char *bmap, char color, int
y += cs_start;
j = cs_start * ((width - 1) / 8 + 1);
}
char *newBits = (char *)malloc(width * height);
unsigned char *newBits = (unsigned char *)malloc(width * height);
memset(newBits, 0, (width * height));
for(int i = 0; i < (width * height) / 8; i++) {
newBits[i * 8 + 0] = (bmap[j] & 0x80) ? fgcolor : bgcolor;
@ -987,7 +987,7 @@ void bx_gui_c::graphics_tile_update(Bit8u *tile, unsigned x0, unsigned y0)
IFDBG_VGA (wxLogDebug ("graphics_tile_update"));
//static Bit32u counter = 0;
//BX_INFO (("graphics_tile_update executed %d times", ++counter));
UpdateScreen((char *)tile, x0, y0, wxTileX, wxTileY);
UpdateScreen(tile, x0, y0, wxTileX, wxTileY);
thePanel->MyRefresh ();
}