From 673b90ad5b21a3d17e64ef65d7053d582920fcbe Mon Sep 17 00:00:00 2001 From: Henrique Nakashima Date: Wed, 10 Oct 2018 23:17:03 +0000 Subject: Rename CPDF_ContentMark to CPDF_ContentMarks. Also change variable names and member names of this type. This better reflects the fact that this class contains all the marks in a page objects, not just one mark. Change-Id: I4fe3d2620e78cbe423f18634f19fa82530d7efe1 Reviewed-on: https://pdfium-review.googlesource.com/c/43813 Reviewed-by: Lei Zhang Commit-Queue: Henrique Nakashima --- fpdfsdk/fpdf_editimg.cpp | 2 +- fpdfsdk/fpdf_editpage.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/fpdf_editimg.cpp b/fpdfsdk/fpdf_editimg.cpp index 231ec6d714..aaa1c46c76 100644 --- a/fpdfsdk/fpdf_editimg.cpp +++ b/fpdfsdk/fpdf_editimg.cpp @@ -292,7 +292,7 @@ FPDFImageObj_GetImageMetadata(FPDF_PAGEOBJECT image_object, if (!pImg) return false; - metadata->marked_content_id = pObj->m_ContentMark.GetMarkedContentID(); + metadata->marked_content_id = pObj->m_ContentMarks.GetMarkedContentID(); const int nPixelWidth = pImg->GetPixelWidth(); const int nPixelHeight = pImg->GetPixelHeight(); diff --git a/fpdfsdk/fpdf_editpage.cpp b/fpdfsdk/fpdf_editpage.cpp index 17a6b63ba7..77d03051b2 100644 --- a/fpdfsdk/fpdf_editpage.cpp +++ b/fpdfsdk/fpdf_editpage.cpp @@ -130,7 +130,7 @@ bool PageObjectContainsMark(CPDF_PageObject* pPageObj, FPDF_PAGEOBJECTMARK mark) { const CPDF_ContentMarkItem* pMarkItem = CPDFContentMarkItemFromFPDFPageObjectMark(mark); - return pMarkItem && pPageObj->m_ContentMark.ContainsItem(pMarkItem); + return pMarkItem && pPageObj->m_ContentMarks.ContainsItem(pMarkItem); } unsigned int GetUnsignedAlpha(float alpha) { @@ -301,7 +301,7 @@ FPDFPageObj_CountMarks(FPDF_PAGEOBJECT page_object) { return -1; const auto& mark = - CPDFPageObjectFromFPDFPageObject(page_object)->m_ContentMark; + CPDFPageObjectFromFPDFPageObject(page_object)->m_ContentMarks; return mark.CountItems(); } @@ -310,7 +310,7 @@ FPDFPageObj_GetMark(FPDF_PAGEOBJECT page_object, unsigned long index) { if (!page_object) return nullptr; - auto* mark = &CPDFPageObjectFromFPDFPageObject(page_object)->m_ContentMark; + auto* mark = &CPDFPageObjectFromFPDFPageObject(page_object)->m_ContentMarks; if (index >= mark->CountItems()) return nullptr; @@ -323,7 +323,7 @@ FPDFPageObj_AddMark(FPDF_PAGEOBJECT page_object, FPDF_BYTESTRING name) { if (!pPageObj) return nullptr; - auto* mark = &pPageObj->m_ContentMark; + auto* mark = &pPageObj->m_ContentMarks; mark->AddMark(name); unsigned long index = mark->CountItems() - 1; @@ -340,7 +340,7 @@ FPDFPageObj_RemoveMark(FPDF_PAGEOBJECT page_object, FPDF_PAGEOBJECTMARK mark) { if (!pPageObj || !pMarkItem) return false; - bool result = pPageObj->m_ContentMark.RemoveMark(pMarkItem); + bool result = pPageObj->m_ContentMarks.RemoveMark(pMarkItem); if (result) pPageObj->SetDirty(true); -- cgit v1.2.3