diff options
author | John Abd-El-Malek <jam@chromium.org> | 2014-12-15 12:13:45 -0800 |
---|---|---|
committer | John Abd-El-Malek <jam@chromium.org> | 2014-12-15 12:13:45 -0800 |
commit | 207299b5d46e3e0612dd6a0264fb7647177312bb (patch) | |
tree | 796aeeeab94a2cac2676e3fb359078609c82f809 /core/src/fxge/dib/fx_dib_engine.cpp | |
parent | 0d4fdc1bbf2c23999271617413f89f059d4a71c9 (diff) | |
download | pdfium-207299b5d46e3e0612dd6a0264fb7647177312bb.tar.xz |
XFA: merge patch from issue 801913002 and 804463003
Simplify PDFium by removing code that's not used in the open source repo.
-remove parameter from FPDF_InitLibrary
-remove a bunch of ifdefs that are unused
Fix build after previous commit.
TBR=tsepez@chromium.org
BUG=
Review URL: https://codereview.chromium.org/809513002
Diffstat (limited to 'core/src/fxge/dib/fx_dib_engine.cpp')
-rw-r--r-- | core/src/fxge/dib/fx_dib_engine.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/core/src/fxge/dib/fx_dib_engine.cpp b/core/src/fxge/dib/fx_dib_engine.cpp index b436f88bd6..f4c0ef16be 100644 --- a/core/src/fxge/dib/fx_dib_engine.cpp +++ b/core/src/fxge/dib/fx_dib_engine.cpp @@ -311,11 +311,7 @@ FX_BOOL CStretchEngine::StartStretchHorz() if (m_DestWidth == 0 || m_pDestScanline == NULL || m_SrcClip.Height() > (int)((1U << 29) / m_InterPitch) || m_SrcClip.Height() == 0) { return FALSE; } -#ifndef _FPDFAPI_MINI_ m_pInterBuf = FX_AllocNL(unsigned char, m_SrcClip.Height() * m_InterPitch); -#else - m_pInterBuf = FX_Alloc(unsigned char, m_SrcClip.Height() * m_InterPitch); -#endif if (m_pInterBuf == NULL) { return FALSE; } @@ -766,11 +762,7 @@ FX_BOOL CFX_ImageStretcher::Continue(IFX_Pause* pPause) return ContinueStretch(pPause); } } -#ifndef _FPDFAPI_MINI_ #define MAX_PROGRESSIVE_STRETCH_PIXELS 1000000 -#else -#define MAX_PROGRESSIVE_STRETCH_PIXELS 100000 -#endif FX_BOOL CFX_ImageStretcher::StartStretch() { m_pStretchEngine = FX_NEW CStretchEngine(m_pDest, m_DestFormat, m_DestWidth, m_DestHeight, m_ClipRect, m_pSource, m_Flags); @@ -793,9 +785,6 @@ FX_BOOL CFX_ImageStretcher::ContinueStretch(IFX_Pause* pPause) } FX_BOOL CFX_ImageStretcher::StartQuickStretch() { -#ifdef _FPDFAPI_MINI_ - m_pSource->SetDownSampleSize(m_DestWidth, m_DestHeight); -#endif m_bFlipX = FALSE; m_bFlipY = FALSE; if (m_DestWidth < 0) { |