diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-12-09 16:26:21 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-12-09 16:26:21 -0800 |
| commit | 035359cd8ddb555fa33b6133db4fd405e4660712 (patch) | |
| tree | 89accecac7da250468166168cd502ed7b92c7ce7 /core/src/fpdftext/txtproc.h | |
| parent | 0c92bed7ade20fe193dce0a481dad48e1be41622 (diff) | |
| download | pdfium-035359cd8ddb555fa33b6133db4fd405e4660712.tar.xz | |
Get rid of most uses of CFX_PtrArray.
I didn't go whole hog and replace these with std::vector,
but in the mean time, it is silly to cast a typedef for
a template instantiated against void* when we can just
instantiate the template against the actual type.
The ones that remain are actual heterogeneous arrays with
wacky casting.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1518593002 .
Diffstat (limited to 'core/src/fpdftext/txtproc.h')
| -rw-r--r-- | core/src/fpdftext/txtproc.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/src/fpdftext/txtproc.h b/core/src/fpdftext/txtproc.h index 22088f2450..27cec5d0a6 100644 --- a/core/src/fpdftext/txtproc.h +++ b/core/src/fpdftext/txtproc.h @@ -48,7 +48,7 @@ class CTextBaseLine { FX_FLOAT m_Top; FX_FLOAT m_Bottom; FX_FLOAT m_MaxFontSizeV; - CFX_PtrArray m_TextList; + CFX_ArrayTemplate<CTextBox*> m_TextList; }; class CPDF_PageObject; class CPDF_TextObject; @@ -73,11 +73,12 @@ class CTextPage { FX_BOOL m_bBreakSpace; private: - CFX_PtrArray m_BaseLines; - CFX_PtrArray m_TextColumns; void FindColumns(); CTextColumn* FindColumn(FX_FLOAT xpos); void BreakSpace(CPDF_TextObject* pTextObj); + + CFX_ArrayTemplate<CTextBaseLine*> m_BaseLines; + CFX_ArrayTemplate<CTextColumn*> m_TextColumns; }; #endif // CORE_SRC_FPDFTEXT_TXTPROC_H_ |