diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-02-14 10:08:55 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-02-14 15:11:27 +0000 |
| commit | d8b01ca3bd9c21e76443004907ea1bc02fb57b6e (patch) | |
| tree | 59f80451f15fef9e4e1641e1aa3eb1b592c4010c /core/fpdftext/cpdf_textpage.h | |
| parent | ceb3ab55ca5ad1fae590f50a09f04b7ed47656b1 (diff) | |
| download | pdfium-d8b01ca3bd9c21e76443004907ea1bc02fb57b6e.tar.xz | |
Revert "Convert Origins to points"
This reverts commit da83d3a5cc09c4056310b3cf299dbbccd5c70d11.
Reason for revert: Reverting chain to see if fixes Chrome roll.
Original change's description:
> Convert Origins to points
>
> This CL converts various OriginX, OriginY pairs into CFX_PointF objects.
>
> Change-Id: I9141f7fc713c710b2014d4fdcdec7dc93501f844
> Reviewed-on: https://pdfium-review.googlesource.com/2575
> Commit-Queue: dsinclair <dsinclair@chromium.org>
> Reviewed-by: Nicolás Peña <npm@chromium.org>
>
TBR=tsepez@chromium.org,dsinclair@chromium.org,npm@chromium.org,pdfium-reviews@googlegroups.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=
Change-Id: I949fb4ec712e2587e7d0ef0191c34db198b61dcc
Reviewed-on: https://pdfium-review.googlesource.com/2696
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fpdftext/cpdf_textpage.h')
| -rw-r--r-- | core/fpdftext/cpdf_textpage.h | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/core/fpdftext/cpdf_textpage.h b/core/fpdftext/cpdf_textpage.h index d22cba3e40..85ee7058b6 100644 --- a/core/fpdftext/cpdf_textpage.h +++ b/core/fpdftext/cpdf_textpage.h @@ -44,16 +44,13 @@ enum class FPDFText_MarkedContent { Pass = 0, Done, Delay }; enum class FPDFText_Direction { Left = -1, Right = 1 }; -class FPDF_CHAR_INFO { - public: - FPDF_CHAR_INFO(); - ~FPDF_CHAR_INFO(); - +struct FPDF_CHAR_INFO { FX_WCHAR m_Unicode; FX_WCHAR m_Charcode; int32_t m_Flag; FX_FLOAT m_FontSize; - CFX_PointF m_Origin; + FX_FLOAT m_OriginX; + FX_FLOAT m_OriginY; CFX_FloatRect m_CharBox; CPDF_TextObject* m_pTextObj; CFX_Matrix m_Matrix; @@ -64,15 +61,11 @@ struct FPDF_SEGMENT { int m_nCount; }; -class PAGECHAR_INFO { - public: - PAGECHAR_INFO(); - PAGECHAR_INFO(const PAGECHAR_INFO&); - ~PAGECHAR_INFO(); - +struct PAGECHAR_INFO { int m_CharCode; FX_WCHAR m_Unicode; - CFX_PointF m_Origin; + FX_FLOAT m_OriginX; + FX_FLOAT m_OriginY; int32_t m_Flag; CFX_FloatRect m_CharBox; CPDF_TextObject* m_pTextObj; |