summaryrefslogtreecommitdiff
path: root/core/fpdfapi
diff options
context:
space:
mode:
Diffstat (limited to 'core/fpdfapi')
-rw-r--r--core/fpdfapi/page/cpdf_contentmark.cpp12
-rw-r--r--core/fpdfapi/page/cpdf_contentmark.h4
-rw-r--r--core/fpdfapi/page/cpdf_contentmarkitem.cpp11
3 files changed, 10 insertions, 17 deletions
diff --git a/core/fpdfapi/page/cpdf_contentmark.cpp b/core/fpdfapi/page/cpdf_contentmark.cpp
index 13945d9337..725a17348b 100644
--- a/core/fpdfapi/page/cpdf_contentmark.cpp
+++ b/core/fpdfapi/page/cpdf_contentmark.cpp
@@ -30,14 +30,14 @@ bool CPDF_ContentMark::ContainsItem(const CPDF_ContentMarkItem* pItem) const {
return m_pMarkData && m_pMarkData->ContainsItem(pItem);
}
-CPDF_ContentMarkItem* CPDF_ContentMark::GetItem(size_t i) {
- ASSERT(i < CountItems());
- return m_pMarkData->GetItem(i);
+CPDF_ContentMarkItem* CPDF_ContentMark::GetItem(size_t index) {
+ return const_cast<CPDF_ContentMarkItem*>(
+ static_cast<const CPDF_ContentMark*>(this)->GetItem(index));
}
-const CPDF_ContentMarkItem* CPDF_ContentMark::GetItem(size_t i) const {
- ASSERT(i < CountItems());
- return m_pMarkData->GetItem(i);
+const CPDF_ContentMarkItem* CPDF_ContentMark::GetItem(size_t index) const {
+ ASSERT(index < CountItems());
+ return m_pMarkData->GetItem(index);
}
int CPDF_ContentMark::GetMarkedContentID() const {
diff --git a/core/fpdfapi/page/cpdf_contentmark.h b/core/fpdfapi/page/cpdf_contentmark.h
index 4f678aff8e..dc4cc08838 100644
--- a/core/fpdfapi/page/cpdf_contentmark.h
+++ b/core/fpdfapi/page/cpdf_contentmark.h
@@ -27,8 +27,8 @@ class CPDF_ContentMark {
bool ContainsItem(const CPDF_ContentMarkItem* pItem) const;
// The returned pointer is never null.
- CPDF_ContentMarkItem* GetItem(size_t i);
- const CPDF_ContentMarkItem* GetItem(size_t i) const;
+ CPDF_ContentMarkItem* GetItem(size_t index);
+ const CPDF_ContentMarkItem* GetItem(size_t index) const;
void AddMark(ByteString name);
void AddMarkWithDirectDict(ByteString name, CPDF_Dictionary* pDict);
diff --git a/core/fpdfapi/page/cpdf_contentmarkitem.cpp b/core/fpdfapi/page/cpdf_contentmarkitem.cpp
index 90a2930b23..8eba4aa15f 100644
--- a/core/fpdfapi/page/cpdf_contentmarkitem.cpp
+++ b/core/fpdfapi/page/cpdf_contentmarkitem.cpp
@@ -28,15 +28,8 @@ const CPDF_Dictionary* CPDF_ContentMarkItem::GetParam() const {
}
CPDF_Dictionary* CPDF_ContentMarkItem::GetParam() {
- switch (m_ParamType) {
- case PropertiesDict:
- return m_pPropertiesDict.Get();
- case DirectDict:
- return m_pDirectDict.get();
- case None:
- default:
- return nullptr;
- }
+ return const_cast<CPDF_Dictionary*>(
+ static_cast<const CPDF_ContentMarkItem*>(this)->GetParam());
}
bool CPDF_ContentMarkItem::HasMCID() const {