diff options
| author | Max Horn | 2009-05-12 23:30:10 +0000 |
|---|---|---|
| committer | Max Horn | 2009-05-12 23:30:10 +0000 |
| commit | 0255cd0213a219fba69860200a987a0d837493a0 (patch) | |
| tree | 1dd1ce850fc46e468e1d00a0ed86f5686630b7be /engines/sci/gfx/gfx_pixmap_scale.cpp | |
| parent | 8d8e9d3aaa717616c001083913d0c1e6fff2c580 (diff) | |
| download | scummvm-rg350-0255cd0213a219fba69860200a987a0d837493a0.tar.gz scummvm-rg350-0255cd0213a219fba69860200a987a0d837493a0.tar.bz2 scummvm-rg350-0255cd0213a219fba69860200a987a0d837493a0.zip | |
SCI: Removed sci_memory.h/.cpp
svn-id: r40514
Diffstat (limited to 'engines/sci/gfx/gfx_pixmap_scale.cpp')
| -rw-r--r-- | engines/sci/gfx/gfx_pixmap_scale.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/gfx/gfx_pixmap_scale.cpp b/engines/sci/gfx/gfx_pixmap_scale.cpp index 9173db5e7c..d13c0d143e 100644 --- a/engines/sci/gfx/gfx_pixmap_scale.cpp +++ b/engines/sci/gfx/gfx_pixmap_scale.cpp @@ -65,7 +65,7 @@ void _gfx_xlate_pixmap_unfiltered(gfx_mode_t *mode, gfx_pixmap_t *pxm, int scale assert(bytespp == COPY_BYTES); if (separate_alpha_map && !alpha_dest) - alpha_dest = pxm->alpha_map = (byte *)sci_malloc(pxm->index_width * xfact * pxm->index_height * yfact); + alpha_dest = pxm->alpha_map = (byte *)malloc(pxm->index_width * xfact * pxm->index_height * yfact); // Calculate all colors for (i = 0; i < pxm->colors_nr(); i++) { @@ -227,7 +227,7 @@ void _gfx_xlate_pixmap_linear(gfx_mode_t *mode, gfx_pixmap_t *pxm, int scale) { shifts[3] = mode->alpha_shift; if (separate_alpha_map && !alpha_dest) - alpha_dest = pxm->alpha_map = (byte *)sci_malloc(pxm->index_width * xfact * pxm->index_height * yfact); + alpha_dest = pxm->alpha_map = (byte *)malloc(pxm->index_width * xfact * pxm->index_height * yfact); for (y = 0; y < pxm->index_height; y++) { byte *linepos = dest; @@ -380,7 +380,7 @@ void _gfx_xlate_pixmap_trilinear(gfx_mode_t *mode, gfx_pixmap_t *pxm, int scale) return; if (separate_alpha_map && !alpha_dest) - alpha_dest = pxm->alpha_map = (byte *)sci_malloc(pxm->index_width * xfact * pxm->index_height * yfact); + alpha_dest = pxm->alpha_map = (byte *)malloc(pxm->index_width * xfact * pxm->index_height * yfact); src -= pxm->index_width + 1; @@ -614,13 +614,13 @@ void gfx_xlate_pixmap(gfx_pixmap_t *pxm, gfx_mode_t *mode, gfx_xlate_filter_t fi if (!pxm->data) { - pxm->data = (byte*)sci_malloc(mode->xfact * mode->yfact * pxm->index_width * pxm->index_height * mode->bytespp + 1); + pxm->data = (byte*)malloc(mode->xfact * mode->yfact * pxm->index_width * pxm->index_height * mode->bytespp + 1); // +1: Eases coying on BE machines in 24 bpp packed mode // Assume that memory, if allocated already, will be sufficient // Allocate alpha map if (!mode->alpha_mask && pxm->colors_nr() < GFX_PIC_COLORS) - pxm->alpha_map = (byte*)sci_malloc(mode->xfact * mode->yfact * pxm->index_width * pxm->index_height + 1); + pxm->alpha_map = (byte*)malloc(mode->xfact * mode->yfact * pxm->index_width * pxm->index_height + 1); } else was_allocated = 1; |