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/fpdfapi | |
| 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/fpdfapi')
| -rw-r--r-- | core/src/fpdfapi/fpdf_page/pageint.h | 3 | ||||
| -rw-r--r-- | core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/core/src/fpdfapi/fpdf_page/pageint.h b/core/src/fpdfapi/fpdf_page/pageint.h index 73c6ec4121..93f34e51a2 100644 --- a/core/src/fpdfapi/fpdf_page/pageint.h +++ b/core/src/fpdfapi/fpdf_page/pageint.h @@ -423,8 +423,9 @@ public: ~CPDF_IccProfile(); FX_INT32 GetComponents() const { return m_nSrcComponents; } FX_BOOL m_bsRGB; - FX_INT32 m_nSrcComponents; FX_LPVOID m_pTransform; +private: + FX_INT32 m_nSrcComponents; }; class CPDF_DeviceCS : public CPDF_ColorSpace { diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp index 7e2a13a406..2d7e1aeb93 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp @@ -1095,13 +1095,11 @@ void CPDF_RenderStatus::DrawPathWithPattern(CPDF_PathObject* pPathObj, const CFX } void CPDF_RenderStatus::ProcessPathPattern(CPDF_PathObject* pPathObj, const CFX_AffineMatrix* pObj2Device, int& filltype, FX_BOOL& bStroke) { - FX_BOOL bPattern = FALSE; if(filltype) { CPDF_Color& FillColor = *pPathObj->m_ColorState.GetFillColor(); if(FillColor.m_pCS && FillColor.m_pCS->GetFamily() == PDFCS_PATTERN) { DrawPathWithPattern(pPathObj, pObj2Device, &FillColor, FALSE); filltype = 0; - bPattern = TRUE; } } if(bStroke) { @@ -1109,7 +1107,6 @@ void CPDF_RenderStatus::ProcessPathPattern(CPDF_PathObject* pPathObj, const CFX_ if(StrokeColor.m_pCS && StrokeColor.m_pCS->GetFamily() == PDFCS_PATTERN) { DrawPathWithPattern(pPathObj, pObj2Device, &StrokeColor, TRUE); bStroke = FALSE; - bPattern = TRUE; } } } |