From c3cffbedb5ff83afa4fde51e98509f915997ff4a Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 21 Mar 2018 13:37:46 +0000 Subject: Fix some param names in the public API. Also fix some comments. Change-Id: Ib42dcf04906139020bdbdfe86e6088faa1c31daa Reviewed-on: https://pdfium-review.googlesource.com/28830 Commit-Queue: dsinclair Reviewed-by: dsinclair --- fpdfsdk/fpdfannot.cpp | 40 ++++++++++++++++++------------------ fpdfsdk/fpdfdoc.cpp | 56 +++++++++++++++++++++++++-------------------------- 2 files changed, 48 insertions(+), 48 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/fpdfannot.cpp b/fpdfsdk/fpdfannot.cpp index 84c6c03194..d2a15ce8c0 100644 --- a/fpdfsdk/fpdfannot.cpp +++ b/fpdfsdk/fpdfannot.cpp @@ -582,8 +582,8 @@ FPDFAnnot_HasAttachmentPoints(FPDF_ANNOTATION annot) { FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFAnnot_SetAttachmentPoints(FPDF_ANNOTATION annot, - const FS_QUADPOINTSF* quadPoints) { - if (!annot || !quadPoints || !FPDFAnnot_HasAttachmentPoints(annot)) + const FS_QUADPOINTSF* quad_points) { + if (!annot || !quad_points || !FPDFAnnot_HasAttachmentPoints(annot)) return false; CPDF_Dictionary* pAnnotDict = @@ -598,14 +598,14 @@ FPDFAnnot_SetAttachmentPoints(FPDF_ANNOTATION annot, else pQuadPoints = pAnnotDict->SetNewFor("QuadPoints"); - pQuadPoints->AddNew(quadPoints->x1); - pQuadPoints->AddNew(quadPoints->y1); - pQuadPoints->AddNew(quadPoints->x2); - pQuadPoints->AddNew(quadPoints->y2); - pQuadPoints->AddNew(quadPoints->x3); - pQuadPoints->AddNew(quadPoints->y3); - pQuadPoints->AddNew(quadPoints->x4); - pQuadPoints->AddNew(quadPoints->y4); + pQuadPoints->AddNew(quad_points->x1); + pQuadPoints->AddNew(quad_points->y1); + pQuadPoints->AddNew(quad_points->x2); + pQuadPoints->AddNew(quad_points->y2); + pQuadPoints->AddNew(quad_points->x3); + pQuadPoints->AddNew(quad_points->y3); + pQuadPoints->AddNew(quad_points->x4); + pQuadPoints->AddNew(quad_points->y4); // If the annotation's appearance stream is defined, and the new quadpoints // defines a bigger bounding box than the appearance stream currently @@ -623,8 +623,8 @@ FPDFAnnot_SetAttachmentPoints(FPDF_ANNOTATION annot, FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFAnnot_GetAttachmentPoints(FPDF_ANNOTATION annot, - FS_QUADPOINTSF* quadPoints) { - if (!annot || !FPDFAnnot_HasAttachmentPoints(annot) || !quadPoints) + FS_QUADPOINTSF* quad_points) { + if (!annot || !quad_points || !FPDFAnnot_HasAttachmentPoints(annot)) return false; CPDF_Dictionary* pAnnotDict = @@ -636,14 +636,14 @@ FPDFAnnot_GetAttachmentPoints(FPDF_ANNOTATION annot, if (!pArray) return false; - quadPoints->x1 = pArray->GetNumberAt(0); - quadPoints->y1 = pArray->GetNumberAt(1); - quadPoints->x2 = pArray->GetNumberAt(2); - quadPoints->y2 = pArray->GetNumberAt(3); - quadPoints->x3 = pArray->GetNumberAt(4); - quadPoints->y3 = pArray->GetNumberAt(5); - quadPoints->x4 = pArray->GetNumberAt(6); - quadPoints->y4 = pArray->GetNumberAt(7); + quad_points->x1 = pArray->GetNumberAt(0); + quad_points->y1 = pArray->GetNumberAt(1); + quad_points->x2 = pArray->GetNumberAt(2); + quad_points->y2 = pArray->GetNumberAt(3); + quad_points->x3 = pArray->GetNumberAt(4); + quad_points->y3 = pArray->GetNumberAt(5); + quad_points->x4 = pArray->GetNumberAt(6); + quad_points->y4 = pArray->GetNumberAt(7); return true; } diff --git a/fpdfsdk/fpdfdoc.cpp b/fpdfsdk/fpdfdoc.cpp index b8209cc972..88ba2464bc 100644 --- a/fpdfsdk/fpdfdoc.cpp +++ b/fpdfsdk/fpdfdoc.cpp @@ -332,9 +332,9 @@ FPDF_EXPORT FPDF_ACTION FPDF_CALLCONV FPDFLink_GetAction(FPDF_LINK pDict) { } FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFLink_Enumerate(FPDF_PAGE page, - int* startPos, - FPDF_LINK* linkAnnot) { - if (!startPos || !linkAnnot) + int* start_pos, + FPDF_LINK* link_annot) { + if (!start_pos || !link_annot) return false; CPDF_Page* pPage = CPDFPageFromFPDFPage(page); if (!pPage || !pPage->m_pFormDict) @@ -342,35 +342,35 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFLink_Enumerate(FPDF_PAGE page, CPDF_Array* pAnnots = pPage->m_pFormDict->GetArrayFor("Annots"); if (!pAnnots) return false; - for (size_t i = *startPos; i < pAnnots->GetCount(); i++) { + for (size_t i = *start_pos; i < pAnnots->GetCount(); i++) { CPDF_Dictionary* pDict = ToDictionary(static_cast(pAnnots->GetDirectObjectAt(i))); if (!pDict) continue; if (pDict->GetStringFor("Subtype") == "Link") { - *startPos = static_cast(i + 1); - *linkAnnot = static_cast(pDict); + *start_pos = static_cast(i + 1); + *link_annot = static_cast(pDict); return true; } } return false; } -FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFLink_GetAnnotRect(FPDF_LINK linkAnnot, +FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFLink_GetAnnotRect(FPDF_LINK link_annot, FS_RECTF* rect) { - if (!linkAnnot || !rect) + if (!link_annot || !rect) return false; CPDF_Dictionary* pAnnotDict = - ToDictionary(static_cast(linkAnnot)); + ToDictionary(static_cast(link_annot)); FSRECTFFromCFXFloatRect(pAnnotDict->GetRectFor("Rect"), rect); return true; } -FPDF_EXPORT int FPDF_CALLCONV FPDFLink_CountQuadPoints(FPDF_LINK linkAnnot) { - if (!linkAnnot) +FPDF_EXPORT int FPDF_CALLCONV FPDFLink_CountQuadPoints(FPDF_LINK link_annot) { + if (!link_annot) return 0; CPDF_Dictionary* pAnnotDict = - ToDictionary(static_cast(linkAnnot)); + ToDictionary(static_cast(link_annot)); CPDF_Array* pArray = pAnnotDict->GetArrayFor("QuadPoints"); if (!pArray) return 0; @@ -378,31 +378,31 @@ FPDF_EXPORT int FPDF_CALLCONV FPDFLink_CountQuadPoints(FPDF_LINK linkAnnot) { } FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV -FPDFLink_GetQuadPoints(FPDF_LINK linkAnnot, - int quadIndex, - FS_QUADPOINTSF* quadPoints) { - if (!linkAnnot || !quadPoints) +FPDFLink_GetQuadPoints(FPDF_LINK link_annot, + int quad_index, + FS_QUADPOINTSF* quad_points) { + if (!link_annot || !quad_points) return false; CPDF_Dictionary* pAnnotDict = - ToDictionary(static_cast(linkAnnot)); + ToDictionary(static_cast(link_annot)); CPDF_Array* pArray = pAnnotDict->GetArrayFor("QuadPoints"); if (!pArray) return false; - if (quadIndex < 0 || - static_cast(quadIndex) >= pArray->GetCount() / 8 || - (static_cast(quadIndex * 8 + 7) >= pArray->GetCount())) { + if (quad_index < 0 || + static_cast(quad_index) >= pArray->GetCount() / 8 || + (static_cast(quad_index * 8 + 7) >= pArray->GetCount())) { return false; } - quadPoints->x1 = pArray->GetNumberAt(quadIndex * 8); - quadPoints->y1 = pArray->GetNumberAt(quadIndex * 8 + 1); - quadPoints->x2 = pArray->GetNumberAt(quadIndex * 8 + 2); - quadPoints->y2 = pArray->GetNumberAt(quadIndex * 8 + 3); - quadPoints->x3 = pArray->GetNumberAt(quadIndex * 8 + 4); - quadPoints->y3 = pArray->GetNumberAt(quadIndex * 8 + 5); - quadPoints->x4 = pArray->GetNumberAt(quadIndex * 8 + 6); - quadPoints->y4 = pArray->GetNumberAt(quadIndex * 8 + 7); + quad_points->x1 = pArray->GetNumberAt(quad_index * 8); + quad_points->y1 = pArray->GetNumberAt(quad_index * 8 + 1); + quad_points->x2 = pArray->GetNumberAt(quad_index * 8 + 2); + quad_points->y2 = pArray->GetNumberAt(quad_index * 8 + 3); + quad_points->x3 = pArray->GetNumberAt(quad_index * 8 + 4); + quad_points->y3 = pArray->GetNumberAt(quad_index * 8 + 5); + quad_points->x4 = pArray->GetNumberAt(quad_index * 8 + 6); + quad_points->y4 = pArray->GetNumberAt(quad_index * 8 + 7); return true; } -- cgit v1.2.3