summaryrefslogtreecommitdiff
path: root/core/fpdftext/cpdf_textpage.h
diff options
context:
space:
mode:
Diffstat (limited to 'core/fpdftext/cpdf_textpage.h')
-rw-r--r--core/fpdftext/cpdf_textpage.h21
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 {