summaryrefslogtreecommitdiff
path: root/core/fpdfapi/page
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-02-13 15:30:30 -0500
committerChromium commit bot <commit-bot@chromium.org>2017-02-13 20:49:26 +0000
commitda83d3a5cc09c4056310b3cf299dbbccd5c70d11 (patch)
treeab0f293986d54615da5a769d0d39aae93f9108c1 /core/fpdfapi/page
parentf0b65545313f065790de7f91c02e5dd160753abd (diff)
downloadpdfium-da83d3a5cc09c4056310b3cf299dbbccd5c70d11.tar.xz
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>
Diffstat (limited to 'core/fpdfapi/page')
-rw-r--r--core/fpdfapi/page/cpdf_textobject.cpp38
-rw-r--r--core/fpdfapi/page/cpdf_textobject.h14
2 files changed, 30 insertions, 22 deletions
diff --git a/core/fpdfapi/page/cpdf_textobject.cpp b/core/fpdfapi/page/cpdf_textobject.cpp
index 1534bc65d6..0404a595bf 100644
--- a/core/fpdfapi/page/cpdf_textobject.cpp
+++ b/core/fpdfapi/page/cpdf_textobject.cpp
@@ -10,6 +10,10 @@
#include "core/fpdfapi/font/cpdf_font.h"
#include "third_party/base/ptr_util.h"
+CPDF_TextObjectItem::CPDF_TextObjectItem() : m_CharCode(0) {}
+
+CPDF_TextObjectItem::~CPDF_TextObjectItem() {}
+
CPDF_TextObject::CPDF_TextObject()
: m_PosX(0),
m_PosY(0),
@@ -31,26 +35,26 @@ int CPDF_TextObject::CountItems() const {
void CPDF_TextObject::GetItemInfo(int index, CPDF_TextObjectItem* pInfo) const {
pInfo->m_CharCode =
m_nChars == 1 ? (uint32_t)(uintptr_t)m_pCharCodes : m_pCharCodes[index];
- pInfo->m_OriginX = index ? m_pCharPos[index - 1] : 0;
- pInfo->m_OriginY = 0;
- if (pInfo->m_CharCode == CPDF_Font::kInvalidCharCode) {
+ pInfo->m_Origin = CFX_PointF(index ? m_pCharPos[index - 1] : 0, 0);
+ if (pInfo->m_CharCode == CPDF_Font::kInvalidCharCode)
return;
- }
+
CPDF_Font* pFont = m_TextState.GetFont();
- if (!pFont->IsCIDFont()) {
+ if (!pFont->IsCIDFont())
return;
- }
- if (!pFont->AsCIDFont()->IsVertWriting()) {
+ if (!pFont->AsCIDFont()->IsVertWriting())
return;
- }
+
uint16_t CID = pFont->AsCIDFont()->CIDFromCharCode(pInfo->m_CharCode);
- pInfo->m_OriginY = pInfo->m_OriginX;
- pInfo->m_OriginX = 0;
- short vx, vy;
+ pInfo->m_Origin = CFX_PointF(0, pInfo->m_Origin.x);
+
+ short vx;
+ short vy;
pFont->AsCIDFont()->GetVertOrigin(CID, vx, vy);
+
FX_FLOAT fontsize = m_TextState.GetFontSize();
- pInfo->m_OriginX -= fontsize * vx / 1000;
- pInfo->m_OriginY -= fontsize * vy / 1000;
+ pInfo->m_Origin.x -= fontsize * vx / 1000;
+ pInfo->m_Origin.y -= fontsize * vy / 1000;
}
int CPDF_TextObject::CountChars() const {
@@ -223,12 +227,12 @@ FX_FLOAT CPDF_TextObject::GetCharWidth(uint32_t charcode) const {
return pCIDFont->GetVertWidth(CID) * fontsize;
}
-FX_FLOAT CPDF_TextObject::GetPosX() const {
- return m_PosX;
+CFX_FloatRect CPDF_TextObject::GetRect() const {
+ return CFX_FloatRect(m_Left, m_Bottom, m_Right, m_Top);
}
-FX_FLOAT CPDF_TextObject::GetPosY() const {
- return m_PosY;
+CFX_PointF CPDF_TextObject::GetPos() const {
+ return CFX_PointF(m_PosX, m_PosY);
}
CPDF_Font* CPDF_TextObject::GetFont() const {
diff --git a/core/fpdfapi/page/cpdf_textobject.h b/core/fpdfapi/page/cpdf_textobject.h
index 2e54f2035e..7445f0d110 100644
--- a/core/fpdfapi/page/cpdf_textobject.h
+++ b/core/fpdfapi/page/cpdf_textobject.h
@@ -13,10 +13,13 @@
#include "core/fxcrt/fx_string.h"
#include "core/fxcrt/fx_system.h"
-struct CPDF_TextObjectItem {
+class CPDF_TextObjectItem {
+ public:
+ CPDF_TextObjectItem();
+ ~CPDF_TextObjectItem();
+
uint32_t m_CharCode;
- FX_FLOAT m_OriginX;
- FX_FLOAT m_OriginY;
+ CFX_PointF m_Origin;
};
class CPDF_TextObject : public CPDF_PageObject {
@@ -38,8 +41,9 @@ class CPDF_TextObject : public CPDF_PageObject {
void GetCharInfo(int index, uint32_t& charcode, FX_FLOAT& kerning) const;
void GetCharInfo(int index, CPDF_TextObjectItem* pInfo) const;
FX_FLOAT GetCharWidth(uint32_t charcode) const;
- FX_FLOAT GetPosX() const;
- FX_FLOAT GetPosY() const;
+
+ CFX_FloatRect GetRect() const;
+ CFX_PointF GetPos() const;
CFX_Matrix GetTextMatrix() const;
CPDF_Font* GetFont() const;
FX_FLOAT GetFontSize() const;