diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2016-03-07 17:08:39 -0500 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2016-03-07 17:08:39 -0500 |
| commit | 594912241cd7d409b5f58a48ccffdc1904d844b2 (patch) | |
| tree | adcdb712f0cfa4cb07d1a490b2d45f15362b4329 /core/src/fxge/dib | |
| parent | c582c0ddfea8ba01c8449ed7841cdb33c12e0a98 (diff) | |
| download | pdfium-594912241cd7d409b5f58a48ccffdc1904d844b2.tar.xz | |
Revert "Fix chromium-style errors."
This reverts commit c582c0ddfea8ba01c8449ed7841cdb33c12e0a98.
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1769263002 .
Diffstat (limited to 'core/src/fxge/dib')
| -rw-r--r-- | core/src/fxge/dib/fx_dib_main.cpp | 40 |
1 files changed, 8 insertions, 32 deletions
diff --git a/core/src/fxge/dib/fx_dib_main.cpp b/core/src/fxge/dib/fx_dib_main.cpp index ab4c170af5..4922373ec0 100644 --- a/core/src/fxge/dib/fx_dib_main.cpp +++ b/core/src/fxge/dib/fx_dib_main.cpp @@ -42,7 +42,6 @@ FX_DWORD ArgbEncode(int a, FX_COLORREF rgb) { return FXARGB_MAKE(a, FXSYS_GetRValue(rgb), FXSYS_GetGValue(rgb), FXSYS_GetBValue(rgb)); } - CFX_DIBSource::CFX_DIBSource() { m_bpp = 0; m_AlphaFlag = 0; @@ -51,26 +50,15 @@ CFX_DIBSource::CFX_DIBSource() { m_pPalette = NULL; m_pAlphaMask = NULL; } - CFX_DIBSource::~CFX_DIBSource() { FX_Free(m_pPalette); delete m_pAlphaMask; } - -uint8_t* CFX_DIBSource::GetBuffer() const { - return NULL; -} - -FX_BOOL CFX_DIBSource::SkipToScanline(int line, IFX_Pause* pPause) const { - return FALSE; -} - CFX_DIBitmap::CFX_DIBitmap() { m_bExtBuf = FALSE; m_pBuffer = NULL; m_pPalette = NULL; } - #define _MAX_OOM_LIMIT_ 12000000 FX_BOOL CFX_DIBitmap::Create(int width, int height, @@ -125,7 +113,6 @@ FX_BOOL CFX_DIBitmap::Create(int width, } return TRUE; } - FX_BOOL CFX_DIBitmap::Copy(const CFX_DIBSource* pSrc) { if (m_pBuffer) { return FALSE; @@ -140,34 +127,24 @@ FX_BOOL CFX_DIBitmap::Copy(const CFX_DIBSource* pSrc) { } return TRUE; } - CFX_DIBitmap::~CFX_DIBitmap() { - if (!m_bExtBuf) + if (!m_bExtBuf) { FX_Free(m_pBuffer); - - m_pBuffer = nullptr; -} - -uint8_t* CFX_DIBitmap::GetBuffer() const { - return m_pBuffer; -} - -const uint8_t* CFX_DIBitmap::GetScanline(int line) const { - return m_pBuffer ? m_pBuffer + line * m_Pitch : nullptr; + } + m_pBuffer = NULL; } - void CFX_DIBitmap::TakeOver(CFX_DIBitmap* pSrcBitmap) { - if (!m_bExtBuf) + if (!m_bExtBuf) { FX_Free(m_pBuffer); - + } FX_Free(m_pPalette); delete m_pAlphaMask; m_pBuffer = pSrcBitmap->m_pBuffer; m_pPalette = pSrcBitmap->m_pPalette; m_pAlphaMask = pSrcBitmap->m_pAlphaMask; - pSrcBitmap->m_pBuffer = nullptr; - pSrcBitmap->m_pPalette = nullptr; - pSrcBitmap->m_pAlphaMask = nullptr; + pSrcBitmap->m_pBuffer = NULL; + pSrcBitmap->m_pPalette = NULL; + pSrcBitmap->m_pAlphaMask = NULL; m_bpp = pSrcBitmap->m_bpp; m_bExtBuf = pSrcBitmap->m_bExtBuf; m_AlphaFlag = pSrcBitmap->m_AlphaFlag; @@ -175,7 +152,6 @@ void CFX_DIBitmap::TakeOver(CFX_DIBitmap* pSrcBitmap) { m_Height = pSrcBitmap->m_Height; m_Pitch = pSrcBitmap->m_Pitch; } - CFX_DIBitmap* CFX_DIBSource::Clone(const FX_RECT* pClip) const { FX_RECT rect(0, 0, m_Width, m_Height); if (pClip) { |