diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-02-16 09:26:40 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-02-16 15:12:38 +0000 |
| commit | 9ad7d96a78f98d865c541ba6a95af7e895ef2836 (patch) | |
| tree | c74cc468b747c3670c40a928919dac5b33c8bde2 /core/fpdftext/cpdf_textpage.h | |
| parent | fa42927a727aa7f7f081b40ff75d1a849c2365c3 (diff) | |
| download | pdfium-9ad7d96a78f98d865c541ba6a95af7e895ef2836.tar.xz | |
Convert CPDF_TextPage classes to CFX_PointFchromium/3015
This CL converts the FX_FLOAT Origin values to CFX_PointF.
Change-Id: Ic47d2bae1dd185fbc4ae88ac15fdd0fdf293c7f9
Reviewed-on: https://pdfium-review.googlesource.com/2716
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'core/fpdftext/cpdf_textpage.h')
| -rw-r--r-- | core/fpdftext/cpdf_textpage.h | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/core/fpdftext/cpdf_textpage.h b/core/fpdftext/cpdf_textpage.h index dd1493ff1c..787715fc51 100644 --- a/core/fpdftext/cpdf_textpage.h +++ b/core/fpdftext/cpdf_textpage.h @@ -44,13 +44,16 @@ enum class FPDFText_MarkedContent { Pass = 0, Done, Delay }; enum class FPDFText_Direction { Left = -1, Right = 1 }; -struct FPDF_CHAR_INFO { +class FPDF_CHAR_INFO { + public: + FPDF_CHAR_INFO(); + ~FPDF_CHAR_INFO(); + FX_WCHAR m_Unicode; FX_WCHAR m_Charcode; int32_t m_Flag; FX_FLOAT m_FontSize; - FX_FLOAT m_OriginX; - FX_FLOAT m_OriginY; + CFX_PointF m_Origin; CFX_FloatRect m_CharBox; CPDF_TextObject* m_pTextObj; CFX_Matrix m_Matrix; @@ -61,16 +64,20 @@ struct FPDF_SEGMENT { int m_nCount; }; -struct PAGECHAR_INFO { +class PAGECHAR_INFO { + public: + PAGECHAR_INFO(); + PAGECHAR_INFO(const PAGECHAR_INFO&); + ~PAGECHAR_INFO(); + + int m_Index; int m_CharCode; FX_WCHAR m_Unicode; - FX_FLOAT m_OriginX; - FX_FLOAT m_OriginY; int32_t m_Flag; + CFX_PointF m_Origin; CFX_FloatRect m_CharBox; CPDF_TextObject* m_pTextObj; CFX_Matrix m_Matrix; - int m_Index; }; struct PDFTEXT_Obj { |