diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-03-20 11:51:32 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-20 21:41:00 +0000 |
| commit | a105e003fd8ac96029f015f20ac8ad1dee8e6391 (patch) | |
| tree | e10bed113802113f3b34ba5363f84e7ee198a143 /core/fpdfdoc/csection.h | |
| parent | 25a9caff72ca0267e9ede38f780127e32c51cb9d (diff) | |
| download | pdfium-a105e003fd8ac96029f015f20ac8ad1dee8e6391.tar.xz | |
Use std::vector<std::unique_ptr<CPVT_WordInfo>> as word array.
We never push nullptrs into this array, so remove some checks for
nullness, but be really careful about bounds checking.
Change-Id: I79960a4cc9a729b3d5985f297aea8c4b03ceb601
Reviewed-on: https://pdfium-review.googlesource.com/3103
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfdoc/csection.h')
| -rw-r--r-- | core/fpdfdoc/csection.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/core/fpdfdoc/csection.h b/core/fpdfdoc/csection.h index 6907b3dc45..b465d1d63d 100644 --- a/core/fpdfdoc/csection.h +++ b/core/fpdfdoc/csection.h @@ -27,8 +27,6 @@ class CSection final { ~CSection(); void ResetAll(); - void ResetLineArray(); - void ResetWordArray(); void ResetLinePlace(); CPVT_WordPlace AddWord(const CPVT_WordPlace& place, const CPVT_WordInfo& wordinfo); @@ -50,7 +48,7 @@ class CSection final { CPVT_WordPlace SecPlace; CPVT_SectionInfo m_SecInfo; std::vector<std::unique_ptr<CLine>> m_LineArray; - CPVT_ArrayTemplate<CPVT_WordInfo*> m_WordArray; + std::vector<std::unique_ptr<CPVT_WordInfo>> m_WordArray; private: friend class CTypeset; |