summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/fpdfdoc/cpdf_dest.cpp22
-rw-r--r--core/fpdfdoc/cpdf_dest.h12
2 files changed, 19 insertions, 15 deletions
diff --git a/core/fpdfdoc/cpdf_dest.cpp b/core/fpdfdoc/cpdf_dest.cpp
index cb15bf1c33..0098f73f66 100644
--- a/core/fpdfdoc/cpdf_dest.cpp
+++ b/core/fpdfdoc/cpdf_dest.cpp
@@ -22,7 +22,11 @@ const char* const g_sZoomModes[] = {"Unknown", "XYZ", "Fit", "FitH",
"FitV", "FitR", "FitB", "FitBH",
"FitBV", nullptr};
-const int g_sZoomModeMaxParamCount[] = {0, 3, 0, 1, 1, 4, 0, 1, 1, 0};
+const uint8_t g_sZoomModeMaxParamCount[] = {0, 3, 0, 1, 1, 4, 0, 1, 1, 0};
+
+static_assert(FX_ArraySize(g_sZoomModes) ==
+ FX_ArraySize(g_sZoomModeMaxParamCount),
+ "Zoom mode count Mismatch");
} // namespace
@@ -34,7 +38,7 @@ CPDF_Dest::CPDF_Dest(CPDF_Object* pObj) : m_pObj(pObj) {}
CPDF_Dest::~CPDF_Dest() {}
-int CPDF_Dest::GetPageIndex(CPDF_Document* pDoc) {
+int CPDF_Dest::GetPageIndex(CPDF_Document* pDoc) const {
CPDF_Array* pArray = ToArray(m_pObj.Get());
if (!pArray)
return 0;
@@ -49,7 +53,7 @@ int CPDF_Dest::GetPageIndex(CPDF_Document* pDoc) {
return pDoc->GetPageIndex(pPage->GetObjNum());
}
-uint32_t CPDF_Dest::GetPageObjNum() {
+uint32_t CPDF_Dest::GetPageObjNum() const {
CPDF_Array* pArray = ToArray(m_pObj.Get());
if (!pArray)
return 0;
@@ -64,7 +68,7 @@ uint32_t CPDF_Dest::GetPageObjNum() {
return 0;
}
-int CPDF_Dest::GetZoomMode() {
+int CPDF_Dest::GetZoomMode() const {
CPDF_Array* pArray = ToArray(m_pObj.Get());
if (!pArray)
return 0;
@@ -129,21 +133,21 @@ bool CPDF_Dest::GetXYZ(bool* pHasX,
return true;
}
-unsigned int CPDF_Dest::GetNumParams() {
+unsigned long CPDF_Dest::GetNumParams() const {
CPDF_Array* pArray = ToArray(m_pObj.Get());
if (!pArray || pArray->GetCount() < 2)
return 0;
- size_t maxParamsForFitType = g_sZoomModeMaxParamCount[GetZoomMode()];
- size_t numParamsInArray = pArray->GetCount() - 2;
+ unsigned long maxParamsForFitType = g_sZoomModeMaxParamCount[GetZoomMode()];
+ unsigned long numParamsInArray = pArray->GetCount() - 2;
return std::min(maxParamsForFitType, numParamsInArray);
}
-float CPDF_Dest::GetParam(int index) {
+float CPDF_Dest::GetParam(int index) const {
CPDF_Array* pArray = ToArray(m_pObj.Get());
return pArray ? pArray->GetNumberAt(2 + index) : 0;
}
-ByteString CPDF_Dest::GetRemoteName() {
+ByteString CPDF_Dest::GetRemoteName() const {
return m_pObj ? m_pObj->GetString() : ByteString();
}
diff --git a/core/fpdfdoc/cpdf_dest.h b/core/fpdfdoc/cpdf_dest.h
index 4959901972..584669a82d 100644
--- a/core/fpdfdoc/cpdf_dest.h
+++ b/core/fpdfdoc/cpdf_dest.h
@@ -22,15 +22,15 @@ class CPDF_Dest {
~CPDF_Dest();
CPDF_Object* GetObject() const { return m_pObj.Get(); }
- ByteString GetRemoteName();
- int GetPageIndex(CPDF_Document* pDoc);
- uint32_t GetPageObjNum();
+ ByteString GetRemoteName() const;
+ int GetPageIndex(CPDF_Document* pDoc) const;
+ uint32_t GetPageObjNum() const;
// Returns the zoom mode, as one of the PDFDEST_VIEW_* values in fpdf_doc.h.
- int GetZoomMode();
+ int GetZoomMode() const;
- unsigned int GetNumParams();
- float GetParam(int index);
+ unsigned long GetNumParams() const;
+ float GetParam(int index) const;
bool GetXYZ(bool* pHasX,
bool* pHasY,