Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-07 13:23:50 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fix crash with -gamma (nw)

Browse Source 
I think this is correct.. or at least more correct than it was, there's no way the existing code could work.
This commit is contained in:
David Haywood 2014-03-20 21:30:40 +00:00
parent 7c2f6824e1
commit 729e588ea1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/emu/render.c
View File

@ -559,6 +559,8 @@ const rgb_t *render_texture::get_adjusted_palette(render_container &container)
// otherwise, ensure we have memory allocated and compute the adjusted result ourself // otherwise, ensure we have memory allocated and compute the adjusted result ourself
numentries = m_bitmap->palette()->num_colors() * m_bitmap->palette()->num_groups(); numentries = m_bitmap->palette()->num_colors() * m_bitmap->palette()->num_groups();
m_bcglookup.resize(numentries); m_bcglookup.resize(numentries);
adjusted = m_bitmap->palette()->entry_list_adjusted();
for (int index = 0; index < numentries; index++) for (int index = 0; index < numentries; index++)
{ {
UINT8 r = container.apply_brightness_contrast_gamma(adjusted[index].r()); UINT8 r = container.apply_brightness_contrast_gamma(adjusted[index].r());
@ -566,6 +568,7 @@ const rgb_t *render_texture::get_adjusted_palette(render_container &container)
UINT8 b = container.apply_brightness_contrast_gamma(adjusted[index].b()); UINT8 b = container.apply_brightness_contrast_gamma(adjusted[index].b());
m_bcglookup[index] = rgb_t(adjusted[index].a(), r, g, b); m_bcglookup[index] = rgb_t(adjusted[index].a(), r, g, b);
} }
return m_bcglookup; return m_bcglookup;
case TEXFORMAT_RGB32: case TEXFORMAT_RGB32:
@ -751,7 +754,7 @@ const rgb_t *render_container::bcg_lookup_table(int texformat, palette_t *palett
{ {
case TEXFORMAT_PALETTE16: case TEXFORMAT_PALETTE16:
case TEXFORMAT_PALETTEA16: case TEXFORMAT_PALETTEA16:
return (palette != NULL && palette == &m_palclient->palette()) ? m_bcglookup : NULL; return (m_palclient != NULL && palette != NULL && palette == &m_palclient->palette()) ? m_bcglookup : NULL;
case TEXFORMAT_RGB32: case TEXFORMAT_RGB32:
case TEXFORMAT_ARGB32: case TEXFORMAT_ARGB32: