From 80f25a5a8135933a405349ffc798d13273b3d690 Mon Sep 17 00:00:00 2001 From: thestig Date: Thu, 19 May 2016 14:36:00 -0700 Subject: Fix leak in CPDF_StreamContentParser::AddTextObject(). ... by using STL containers in more places. Remove dead / duplicate code as well. BUG=603904 Review-Url: https://codereview.chromium.org/1998583002 --- core/fpdfapi/fpdf_page/include/cpdf_clippath.h | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'core/fpdfapi/fpdf_page/include') diff --git a/core/fpdfapi/fpdf_page/include/cpdf_clippath.h b/core/fpdfapi/fpdf_page/include/cpdf_clippath.h index 6f239e661f..1daacf55d0 100644 --- a/core/fpdfapi/fpdf_page/include/cpdf_clippath.h +++ b/core/fpdfapi/fpdf_page/include/cpdf_clippath.h @@ -17,17 +17,14 @@ class CPDF_TextObject; class CPDF_ClipPath : public CFX_CountRef { public: - uint32_t GetPathCount() const { return m_pObject->m_PathCount; } - CPDF_Path GetPath(int i) const { return m_pObject->m_pPathList[i]; } - int GetClipType(int i) const { return m_pObject->m_pTypeList[i]; } - uint32_t GetTextCount() const { return m_pObject->m_TextCount; } - CPDF_TextObject* GetText(int i) const { return m_pObject->m_pTextList[i]; } + uint32_t GetPathCount() const; + CPDF_Path GetPath(size_t i) const; + uint8_t GetClipType(size_t i) const; + uint32_t GetTextCount() const; + CPDF_TextObject* GetText(size_t i) const; CFX_FloatRect GetClipBox() const; - - void AppendPath(CPDF_Path path, int type, FX_BOOL bAutoMerge); - void DeletePath(int layer_index); - - void AppendTexts(CPDF_TextObject** pTexts, int count); + void AppendPath(CPDF_Path path, uint8_t type, bool bAutoMerge); + void AppendTexts(std::vector>* pTexts); void Transform(const CFX_Matrix& matrix); }; -- cgit v1.2.3