From aca3efc9c0d8750b7f642a23eea1a665d7a1af5c Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 16 Mar 2018 20:27:04 +0000 Subject: Fix methods that have definition with different parameter names. Found by ClangTidy. BUG=pdfium:1039 Change-Id: I2bb9256a63d5459e959c1a3228418073245d7a86 Reviewed-on: https://pdfium-review.googlesource.com/28731 Reviewed-by: Henrique Nakashima Commit-Queue: Lei Zhang --- core/fpdfapi/page/cpdf_image.cpp | 14 +++++++------- core/fxge/cfx_font.h | 2 +- fpdfsdk/fpdf_ppo.cpp | 14 +++++++------- fpdfsdk/fpdfdoc.cpp | 16 ++++++++-------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/core/fpdfapi/page/cpdf_image.cpp b/core/fpdfapi/page/cpdf_image.cpp index 68432bf1fe..ec826dc5ed 100644 --- a/core/fpdfapi/page/cpdf_image.cpp +++ b/core/fpdfapi/page/cpdf_image.cpp @@ -49,13 +49,13 @@ CPDF_Image::CPDF_Image(CPDF_Document* pDoc, uint32_t dwStreamObjNum) CPDF_Image::~CPDF_Image() {} -void CPDF_Image::FinishInitialization(CPDF_Dictionary* pDict) { - m_pOC = pDict->GetDictFor("OC"); - m_bIsMask = - !pDict->KeyExist("ColorSpace") || pDict->GetIntegerFor("ImageMask"); - m_bInterpolate = !!pDict->GetIntegerFor("Interpolate"); - m_Height = pDict->GetIntegerFor("Height"); - m_Width = pDict->GetIntegerFor("Width"); +void CPDF_Image::FinishInitialization(CPDF_Dictionary* pStreamDict) { + m_pOC = pStreamDict->GetDictFor("OC"); + m_bIsMask = !pStreamDict->KeyExist("ColorSpace") || + pStreamDict->GetIntegerFor("ImageMask"); + m_bInterpolate = !!pStreamDict->GetIntegerFor("Interpolate"); + m_Height = pStreamDict->GetIntegerFor("Height"); + m_Width = pStreamDict->GetIntegerFor("Width"); } void CPDF_Image::ConvertStreamToIndirectObject() { diff --git a/core/fxge/cfx_font.h b/core/fxge/cfx_font.h index 3739cad9f3..c753e7e29d 100644 --- a/core/fxge/cfx_font.h +++ b/core/fxge/cfx_font.h @@ -84,7 +84,7 @@ class CFX_Font { #endif uint8_t* GetFontData() const { return m_pFontData; } uint32_t GetSize() const { return m_dwSize; } - void AdjustMMParams(int glyph_index, uint32_t width, int weight) const; + void AdjustMMParams(int glyph_index, uint32_t dest_width, int weight) const; CFX_PathData* LoadGlyphPathImpl(uint32_t glyph_index, uint32_t dest_width) const; diff --git a/fpdfsdk/fpdf_ppo.cpp b/fpdfsdk/fpdf_ppo.cpp index 1c9550a54a..ceceacf01d 100644 --- a/fpdfsdk/fpdf_ppo.cpp +++ b/fpdfsdk/fpdf_ppo.cpp @@ -60,11 +60,11 @@ class NupState { // use. std::pair ConvertPageOrder() const; - // Given the |subx| and |suby| subpage position within a page, and a source + // Given the |subX| and |subY| subpage position within a page, and a source // page with dimensions of |pagesize|, calculate the sub page's origin and // scale. - NupPageSettings CalculatePageEdit(size_t subx, - size_t suby, + NupPageSettings CalculatePageEdit(size_t subX, + size_t subY, const CFX_SizeF& pagesize) const; const CFX_SizeF m_destPageSize; @@ -103,12 +103,12 @@ std::pair NupState::ConvertPageOrder() const { return {subX, subY}; } -NupPageSettings NupState::CalculatePageEdit(size_t subXPos, - size_t subYPos, +NupPageSettings NupState::CalculatePageEdit(size_t subX, + size_t subY, const CFX_SizeF& pagesize) const { NupPageSettings settings; - settings.subPageStartPoint.x = subXPos * m_subPageSize.width; - settings.subPageStartPoint.y = subYPos * m_subPageSize.height; + settings.subPageStartPoint.x = subX * m_subPageSize.width; + settings.subPageStartPoint.y = subY * m_subPageSize.height; const float xScale = m_subPageSize.width / pagesize.width; const float yScale = m_subPageSize.height / pagesize.height; diff --git a/fpdfsdk/fpdfdoc.cpp b/fpdfsdk/fpdfdoc.cpp index e5edc29b9f..b8209cc972 100644 --- a/fpdfsdk/fpdfdoc.cpp +++ b/fpdfsdk/fpdfdoc.cpp @@ -200,29 +200,29 @@ FPDFAction_GetURIPath(FPDF_DOCUMENT document, } FPDF_EXPORT unsigned long FPDF_CALLCONV -FPDFDest_GetPageIndex(FPDF_DOCUMENT document, FPDF_DEST pDest) { - if (!pDest) +FPDFDest_GetPageIndex(FPDF_DOCUMENT document, FPDF_DEST dest) { + if (!dest) return 0; CPDF_Document* pDoc = CPDFDocumentFromFPDFDocument(document); if (!pDoc) return 0; - CPDF_Dest dest(static_cast(pDest)); - return dest.GetPageIndexDeprecated(pDoc); + CPDF_Dest destination(static_cast(dest)); + return destination.GetPageIndexDeprecated(pDoc); } FPDF_EXPORT int FPDF_CALLCONV FPDFDest_GetDestPageIndex(FPDF_DOCUMENT document, - FPDF_DEST pDest) { - if (!pDest) + FPDF_DEST dest) { + if (!dest) return -1; CPDF_Document* pDoc = CPDFDocumentFromFPDFDocument(document); if (!pDoc) return -1; - CPDF_Dest dest(static_cast(pDest)); - return dest.GetDestPageIndex(pDoc); + CPDF_Dest destination(static_cast(dest)); + return destination.GetDestPageIndex(pDoc); } FPDF_EXPORT unsigned long FPDF_CALLCONV -- cgit v1.2.3