diff options
| author | Ryan Harrison <rharrison@chromium.org> | 2018-08-23 20:58:14 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-08-23 20:58:14 +0000 |
| commit | 203339a2aa88bb31576233220d7ced73920a596f (patch) | |
| tree | 895fc5fcc07107c8cc6f81b9c6e0f12faef9fc1e /fpdfsdk | |
| parent | 3b45012d57884b06915eb5a1f54fbba04a45e807 (diff) | |
| download | pdfium-203339a2aa88bb31576233220d7ced73920a596f.tar.xz | |
Fix shadowed variables
This CL fixes instances of variable shadowing that are
discovered by turning on -Wshadow.
BUG=pdfium:1137
Change-Id: I418d50de89ecbeb12e85b23a358bc61e8f16e888
Reviewed-on: https://pdfium-review.googlesource.com/41150
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'fpdfsdk')
| -rw-r--r-- | fpdfsdk/formfiller/cba_fontmap.cpp | 3 | ||||
| -rw-r--r-- | fpdfsdk/fpdf_transformpage.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/fpdfsdk/formfiller/cba_fontmap.cpp b/fpdfsdk/formfiller/cba_fontmap.cpp index 98464cb6d6..577f1e0638 100644 --- a/fpdfsdk/formfiller/cba_fontmap.cpp +++ b/fpdfsdk/formfiller/cba_fontmap.cpp @@ -154,8 +154,7 @@ void CBA_FontMap::AddFontToAnnotDict(CPDF_Font* pFont, pAPDict = m_pAnnotDict->SetNewFor<CPDF_Dictionary>("AP"); // to avoid checkbox and radiobutton - CPDF_Object* pObject = pAPDict->GetObjectFor(m_sAPType); - if (ToDictionary(pObject)) + if (ToDictionary(pAPDict->GetObjectFor(m_sAPType))) return; CPDF_Stream* pStream = pAPDict->GetStreamFor(m_sAPType); diff --git a/fpdfsdk/fpdf_transformpage.cpp b/fpdfsdk/fpdf_transformpage.cpp index d20b28fe81..2458e939d2 100644 --- a/fpdfsdk/fpdf_transformpage.cpp +++ b/fpdfsdk/fpdf_transformpage.cpp @@ -147,7 +147,7 @@ FPDFPage_TransFormWithClip(FPDF_PAGE page, pContentArray->InsertAt(0, pStream->MakeReference(pDoc)); pContentArray->Add(pEndStream->MakeReference(pDoc)); } else if (pContentObj->IsStream() && !pContentObj->IsInline()) { - CPDF_Array* pContentArray = pDoc->NewIndirect<CPDF_Array>(); + pContentArray = pDoc->NewIndirect<CPDF_Array>(); pContentArray->Add(pStream->MakeReference(pDoc)); pContentArray->Add(pContentObj->MakeReference(pDoc)); pContentArray->Add(pEndStream->MakeReference(pDoc)); |