From f8ffc048195bd96ee58a1aeefcae2ac3f8950ed8 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 25 Apr 2018 17:45:01 +0000 Subject: Fix slight type inconsistencies discovered with strict FPDF API types. Moved to an independent CL from https://pdfium-review.googlesource.com/c/pdfium/+/31296 Change-Id: Ia76e5609dc09bb7b483e092b10d9f8522e2dc175 Reviewed-on: https://pdfium-review.googlesource.com/31297 Reviewed-by: dsinclair Commit-Queue: Tom Sepez --- core/fpdfdoc/cpdf_dest.cpp | 4 ++-- core/fpdfdoc/cpdf_dest.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'core') diff --git a/core/fpdfdoc/cpdf_dest.cpp b/core/fpdfdoc/cpdf_dest.cpp index 015cdcbc09..e787dcdd22 100644 --- a/core/fpdfdoc/cpdf_dest.cpp +++ b/core/fpdfdoc/cpdf_dest.cpp @@ -32,9 +32,9 @@ static_assert(FX_ArraySize(g_sZoomModes) == CPDF_Dest::CPDF_Dest() {} -CPDF_Dest::CPDF_Dest(const CPDF_Dest& pObj) = default; +CPDF_Dest::CPDF_Dest(const CPDF_Dest& that) = default; -CPDF_Dest::CPDF_Dest(CPDF_Object* pObj) : m_pObj(pObj) {} +CPDF_Dest::CPDF_Dest(CPDF_Array* pObj) : m_pObj(pObj) {} CPDF_Dest::~CPDF_Dest() {} diff --git a/core/fpdfdoc/cpdf_dest.h b/core/fpdfdoc/cpdf_dest.h index 709a2470c5..9f9f08723f 100644 --- a/core/fpdfdoc/cpdf_dest.h +++ b/core/fpdfdoc/cpdf_dest.h @@ -12,16 +12,16 @@ #include "core/fxcrt/unowned_ptr.h" class CPDF_Document; -class CPDF_Object; +class CPDF_Array; class CPDF_Dest { public: CPDF_Dest(); CPDF_Dest(const CPDF_Dest& that); - explicit CPDF_Dest(CPDF_Object* pObj); + explicit CPDF_Dest(CPDF_Array* pObj); ~CPDF_Dest(); - CPDF_Object* GetObject() const { return m_pObj.Get(); } + CPDF_Array* GetObject() const { return m_pObj.Get(); } ByteString GetRemoteName() const; // Deprecated. Use GetDestPageIndex instead. @@ -46,7 +46,7 @@ class CPDF_Dest { float* pZoom) const; private: - UnownedPtr m_pObj; + UnownedPtr m_pObj; }; #endif // CORE_FPDFDOC_CPDF_DEST_H_ -- cgit v1.2.3