From 3522876d5291922ddc62bf1b70d02743b0850673 Mon Sep 17 00:00:00 2001 From: Bo Xu Date: Tue, 8 Jul 2014 15:30:46 -0700 Subject: Remove custom memory manager BUG= R=palmer@chromium.org Review URL: https://codereview.chromium.org/372473003 --- core/src/fxge/dib/fx_dib_convert.cpp | 4 ---- core/src/fxge/dib/fx_dib_engine.cpp | 2 -- core/src/fxge/dib/fx_dib_main.cpp | 1 - 3 files changed, 7 deletions(-) (limited to 'core/src/fxge/dib') diff --git a/core/src/fxge/dib/fx_dib_convert.cpp b/core/src/fxge/dib/fx_dib_convert.cpp index 2a74452626..ddc24cc4ad 100644 --- a/core/src/fxge/dib/fx_dib_convert.cpp +++ b/core/src/fxge/dib/fx_dib_convert.cpp @@ -239,7 +239,6 @@ FX_BOOL CFX_Palette::BuildPalette(const CFX_DIBSource* pBitmap, int pal_type) if (!m_pPalette) { return FALSE; } - FXSYS_memset32(m_pPalette, 0, sizeof(FX_DWORD) * 256); int bpp = pBitmap->GetBPP() / 8; int width = pBitmap->GetWidth(); int height = pBitmap->GetHeight(); @@ -259,8 +258,6 @@ FX_BOOL CFX_Palette::BuildPalette(const CFX_DIBSource* pBitmap, int pal_type) if (!m_aLut) { return FALSE; } - FXSYS_memset32(m_aLut, 0, sizeof(FX_DWORD) * 4096); - FXSYS_memset32(m_cLut, 0, sizeof(FX_DWORD) * 4096); int row, col; m_lut = 0; for (row = 0; row < height; row++) { @@ -878,7 +875,6 @@ FX_BOOL ConvertBuffer(FXDIB_Format dest_format, FX_LPBYTE dest_buf, int dest_pit if (!d_pal) { return FALSE; } - FXSYS_memset32(d_pal, 0, sizeof(FX_DWORD) * 256); if (((src_format & 0xff) == 1 || (src_format & 0xff) == 8) && pSrcBitmap->GetPalette()) { return _ConvertBuffer_Plt2PltRgb8(dest_buf, dest_pitch, width, height, pSrcBitmap, src_left, src_top, d_pal, pIccTransform); } else if ((src_format & 0xff) >= 24) { diff --git a/core/src/fxge/dib/fx_dib_engine.cpp b/core/src/fxge/dib/fx_dib_engine.cpp index a51038628e..803d906ff9 100644 --- a/core/src/fxge/dib/fx_dib_engine.cpp +++ b/core/src/fxge/dib/fx_dib_engine.cpp @@ -32,7 +32,6 @@ void CWeightTable::Calc(int dest_len, int dest_min, int dest_max, int src_len, i if (m_pWeightTables == NULL) { return; } - FXSYS_memset32(m_pWeightTables, 0, sizeof(FX_BYTE) * ((dest_max - dest_min)*m_ItemSize + 4)); if ((flags & FXDIB_NOSMOOTH) != 0 || FXSYS_fabs((FX_FLOAT)scale) < 1.0f) { for (int dest_pixel = dest_min; dest_pixel < dest_max; dest_pixel ++) { PixelWeight& pixel_weights = *GetPixelWeight(dest_pixel); @@ -207,7 +206,6 @@ CStretchEngine::CStretchEngine(IFX_ScanlineComposer* pDestBitmap, FXDIB_Format d if (m_pDestScanline == NULL) { return; } - FXSYS_memset32(m_pDestScanline, 0, sizeof(FX_BYTE) * size); if (dest_format == FXDIB_Rgb32) { FXSYS_memset8(m_pDestScanline, 255, size); } diff --git a/core/src/fxge/dib/fx_dib_main.cpp b/core/src/fxge/dib/fx_dib_main.cpp index 7644e39f02..3e1e8cf91b 100644 --- a/core/src/fxge/dib/fx_dib_main.cpp +++ b/core/src/fxge/dib/fx_dib_main.cpp @@ -91,7 +91,6 @@ FX_BOOL CFX_DIBitmap::Create(int width, int height, FXDIB_Format format, FX_LPBY if (m_pBuffer == NULL) { return FALSE; } - FXSYS_memset32(m_pBuffer, 0, sizeof (FX_BYTE) * size); } m_Width = width; m_Height = height; -- cgit v1.2.3