diff options
Diffstat (limited to 'fpdfsdk')
| -rw-r--r-- | fpdfsdk/fpdf_ppo.cpp | 14 | ||||
| -rw-r--r-- | fpdfsdk/fpdfdoc.cpp | 16 |
2 files changed, 15 insertions, 15 deletions
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<size_t, size_t> 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<size_t, size_t> 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<CPDF_Array*>(pDest)); - return dest.GetPageIndexDeprecated(pDoc); + CPDF_Dest destination(static_cast<CPDF_Array*>(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<CPDF_Array*>(pDest)); - return dest.GetDestPageIndex(pDoc); + CPDF_Dest destination(static_cast<CPDF_Array*>(dest)); + return destination.GetDestPageIndex(pDoc); } FPDF_EXPORT unsigned long FPDF_CALLCONV |