Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove stray bitmap_free's.

Browse Source
This commit is contained in:
Aaron Giles 2010-06-08 23:40:57 +00:00
parent 13c37d16c5
commit ad12251785
5 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/emu/crsshair.c
View File

@ -155,8 +155,7 @@ static void create_bitmap(running_machine *machine, int player)
rgb_t color = crosshair_colors[player]; rgb_t color = crosshair_colors[player];
/* if we have a bitmap for this player, kill it */ /* if we have a bitmap for this player, kill it */
if (global.bitmap[player] != NULL) global_free(global.bitmap[player]);
bitmap_free(global.bitmap[player]);
if (global.name[player][0] != 0) if (global.name[player][0] != 0)
{ {
@ -268,8 +267,7 @@ static void crosshair_exit(running_machine *machine)
render_texture_free(global.texture[player]); render_texture_free(global.texture[player]);
global.texture[player] = NULL; global.texture[player] = NULL;
if (global.bitmap[player] != NULL) global_free(global.bitmap[player]);
bitmap_free(global.bitmap[player]);
global.bitmap[player] = NULL; global.bitmap[player] = NULL;
} }
} }

2
src/emu/rendlay.c
View File

@ -1881,7 +1881,7 @@ static bitmap_t *load_component_bitmap(const char *dirname, const char *file, co
/* load the alpha bitmap if specified */ /* load the alpha bitmap if specified */
if (render_load_png(OPTION_ARTPATH, dirname, alphafile, bitmap, hasalpha) == NULL) if (render_load_png(OPTION_ARTPATH, dirname, alphafile, bitmap, hasalpha) == NULL)
{ {
bitmap_free(bitmap); global_free(bitmap);
bitmap = NULL; bitmap = NULL;
} }

3
src/osd/sdl/video.c
View File

@ -153,8 +153,7 @@ error:
static void video_exit(running_machine *machine) static void video_exit(running_machine *machine)
{ {
// free the overlay effect // free the overlay effect
if (effect_bitmap != NULL) global_free(effect_bitmap);
bitmap_free(effect_bitmap);
effect_bitmap = NULL; effect_bitmap = NULL;
// free all of our monitor information // free all of our monitor information

3
src/osd/windows/drawd3d.c
View File

@ -578,8 +578,7 @@ static void drawd3d_window_destroy(win_window_info *window)
device_delete(d3d); device_delete(d3d);
// experimental: free the vector PNG // experimental: free the vector PNG
if (d3d->vector_bitmap != NULL) global_free(d3d->vector_bitmap);
bitmap_free(d3d->vector_bitmap);
// free the memory in the window // free the memory in the window
global_free(d3d); global_free(d3d);

3
src/osd/windows/video.c
View File

@ -149,8 +149,7 @@ void winvideo_init(running_machine *machine)
static void winvideo_exit(running_machine *machine) static void winvideo_exit(running_machine *machine)
{ {
// free the overlay effect // free the overlay effect
if (effect_bitmap != NULL) global_free(effect_bitmap);
bitmap_free(effect_bitmap);
effect_bitmap = NULL; effect_bitmap = NULL;
// free all of our monitor information // free all of our monitor information