diff options
Diffstat (limited to 'src/emu/drawgfx.c')
-rw-r--r-- | src/emu/drawgfx.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/emu/drawgfx.c b/src/emu/drawgfx.c index 732f5fa9523..70332549135 100644 --- a/src/emu/drawgfx.c +++ b/src/emu/drawgfx.c @@ -90,8 +90,7 @@ gfx_element *gfx_element_alloc(running_machine *machine, const gfx_layout *gl, c gfx_element *gfx; /* allocate memory for the gfx_element structure */ - gfx = (gfx_element *)malloc_or_die(sizeof(*gfx)); - memset(gfx, 0, sizeof(*gfx)); + gfx = alloc_clear_or_die(gfx_element); /* fill in the data */ gfx->width = width; @@ -120,7 +119,7 @@ gfx_element *gfx_element_alloc(running_machine *machine, const gfx_layout *gl, c } else { - UINT32 *buffer = (UINT32 *)malloc_or_die(sizeof(buffer[0]) * gfx->layout.width); + UINT32 *buffer = alloc_array_or_die(UINT32, gfx->layout.width); memcpy(buffer, gfx->layout.extxoffs, sizeof(gfx->layout.extxoffs[0]) * gfx->layout.width); gfx->layout.extxoffs = buffer; } @@ -135,7 +134,7 @@ gfx_element *gfx_element_alloc(running_machine *machine, const gfx_layout *gl, c } else { - UINT32 *buffer = (UINT32 *)malloc_or_die(sizeof(buffer[0]) * gfx->layout.height); + UINT32 *buffer = alloc_array_or_die(UINT32, gfx->layout.height); memcpy(buffer, gfx->layout.extyoffs, sizeof(gfx->layout.extyoffs[0]) * gfx->layout.height); gfx->layout.extyoffs = buffer; } @@ -143,10 +142,10 @@ gfx_element *gfx_element_alloc(running_machine *machine, const gfx_layout *gl, c /* allocate a pen usage array for entries with 32 pens or less */ if (gfx->color_depth <= 32) - gfx->pen_usage = (UINT32 *)malloc_or_die(gfx->total_elements * sizeof(*gfx->pen_usage)); + gfx->pen_usage = alloc_array_or_die(UINT32, gfx->total_elements); /* allocate a dirty array */ - gfx->dirty = (UINT8 *)malloc_or_die(gfx->total_elements * sizeof(*gfx->dirty)); + gfx->dirty = alloc_array_or_die(UINT8, gfx->total_elements); memset(gfx->dirty, 1, gfx->total_elements * sizeof(*gfx->dirty)); /* raw graphics case */ @@ -173,7 +172,7 @@ gfx_element *gfx_element_alloc(running_machine *machine, const gfx_layout *gl, c gfx->char_modulo = gfx->line_modulo * gfx->origheight; /* allocate memory for the data */ - gfx->gfxdata = (UINT8 *)malloc_or_die(gfx->total_elements * gfx->char_modulo); + gfx->gfxdata = alloc_array_or_die(UINT8, gfx->total_elements * gfx->char_modulo); } return gfx; |