diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-05-08 13:52:49 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-05-08 13:52:49 -0700 |
| commit | ea7b333c73ea3e1847e79cabdd85853af67d6d6c (patch) | |
| tree | 4f04b9ab62d02b4a3050d914008260611ea575c8 /core/src/fxge/dib | |
| parent | eff208f03dc7ea7606a3dc03150291f264147d60 (diff) | |
| download | pdfium-ea7b333c73ea3e1847e79cabdd85853af67d6d6c.tar.xz | |
Merge to XFA: Fix a bunch of -Wunused-but-set-variable warnings.
Also fix a few nits and other errors along the way.
Review URL: https://codereview.chromium.org/1098583002
Review URL: https://codereview.chromium.org/1135713004
(cherry picked from commit f0a169e6fd5718995fa6ef8749c8d16cdad84985)
(cherry picked from commit 470408c2ffe71e99cebad0d1d6887f1723f02cef)
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1133453006
Diffstat (limited to 'core/src/fxge/dib')
| -rw-r--r-- | core/src/fxge/dib/fx_dib_composite.cpp | 10 | ||||
| -rw-r--r-- | core/src/fxge/dib/fx_dib_transform.cpp | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/core/src/fxge/dib/fx_dib_composite.cpp b/core/src/fxge/dib/fx_dib_composite.cpp index 375b7c110e..ae72fc5a43 100644 --- a/core/src/fxge/dib/fx_dib_composite.cpp +++ b/core/src/fxge/dib/fx_dib_composite.cpp @@ -4148,15 +4148,7 @@ FX_BOOL CFX_DIBitmap::CompositeBitmap(int dest_left, int dest_top, int width, in } int dest_Bpp = m_bpp / 8; int src_Bpp = pSrcBitmap->GetBPP() / 8; - FX_BOOL bRgb = FALSE; - FX_BOOL bCmyk = FALSE; - if (src_Bpp > 1) { - if (pSrcBitmap->IsCmykImage()) { - bCmyk = TRUE; - } else { - bRgb = TRUE; - } - } + FX_BOOL bRgb = src_Bpp > 1 && !pSrcBitmap->IsCmykImage(); CFX_DIBitmap* pSrcAlphaMask = pSrcBitmap->m_pAlphaMask; for (int row = 0; row < height; row ++) { FX_LPBYTE dest_scan = m_pBuffer + (dest_top + row) * m_Pitch + dest_left * dest_Bpp; diff --git a/core/src/fxge/dib/fx_dib_transform.cpp b/core/src/fxge/dib/fx_dib_transform.cpp index 65afdd6b3a..a9a1e66d99 100644 --- a/core/src/fxge/dib/fx_dib_transform.cpp +++ b/core/src/fxge/dib/fx_dib_transform.cpp @@ -73,7 +73,6 @@ CFX_DIBitmap* CFX_DIBSource::SwapXY(FX_BOOL bXFlip, FX_BOOL bYFlip, const FX_REC return NULL; } pTransBitmap->CopyPalette(m_pPalette); - int src_pitch = m_Pitch; int dest_pitch = pTransBitmap->GetPitch(); FX_LPBYTE dest_buf = pTransBitmap->GetBuffer(); int row_start = bXFlip ? m_Height - dest_clip.right : dest_clip.left; @@ -133,7 +132,6 @@ CFX_DIBitmap* CFX_DIBSource::SwapXY(FX_BOOL bXFlip, FX_BOOL bYFlip, const FX_REC } } if (m_pAlphaMask) { - src_pitch = m_pAlphaMask->m_Pitch; dest_pitch = pTransBitmap->m_pAlphaMask->GetPitch(); dest_buf = pTransBitmap->m_pAlphaMask->GetBuffer(); int dest_step = bYFlip ? -dest_pitch : dest_pitch; |