From 7a1220dc1c0051f2a6bf50f3f38419ae51ecb9a1 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 17 Mar 2017 14:17:25 -0700 Subject: Replace CLines class with std::vector. m_LineArray only grows via push_back of non-null pointer, so remove some null checks. Another little idiosyncrasy is CLines::Clear() doesn't clear the items in CLines, only the things that were once in CLines but aren't anymore. So don't call it. Change-Id: Icc434be94b1b0522533c7533b8f6b2736bb864c4 Reviewed-on: https://pdfium-review.googlesource.com/3099 Reviewed-by: Lei Zhang Commit-Queue: Tom Sepez --- core/fpdfdoc/clines.cpp | 52 ------------------------------------------------- 1 file changed, 52 deletions(-) delete mode 100644 core/fpdfdoc/clines.cpp (limited to 'core/fpdfdoc/clines.cpp') diff --git a/core/fpdfdoc/clines.cpp b/core/fpdfdoc/clines.cpp deleted file mode 100644 index 1e425eab93..0000000000 --- a/core/fpdfdoc/clines.cpp +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright 2016 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#include "core/fpdfdoc/clines.h" - -#include "core/fpdfdoc/cline.h" - -CLines::CLines() : m_nTotal(0) {} - -CLines::~CLines() { - RemoveAll(); -} - -int32_t CLines::GetSize() const { - return m_Lines.GetSize(); -} - -CLine* CLines::GetAt(int32_t nIndex) const { - return m_Lines.GetAt(nIndex); -} - -void CLines::Empty() { - m_nTotal = 0; -} - -void CLines::RemoveAll() { - for (int32_t i = 0, sz = GetSize(); i < sz; i++) - delete GetAt(i); - m_Lines.RemoveAll(); - m_nTotal = 0; -} - -int32_t CLines::Add(const CPVT_LineInfo& lineinfo) { - if (m_nTotal >= GetSize()) { - CLine* pLine = new CLine; - pLine->m_LineInfo = lineinfo; - m_Lines.Add(pLine); - } else if (CLine* pLine = GetAt(m_nTotal)) { - pLine->m_LineInfo = lineinfo; - } - return m_nTotal++; -} - -void CLines::Clear() { - for (int32_t i = GetSize() - 1; i >= m_nTotal; i--) { - delete GetAt(i); - m_Lines.RemoveAt(i); - } -} -- cgit v1.2.3