Rename FPDF_CHAR_INFO class to CPDF_TextPage::CharInfo.
Avoid "FPDF" in code not defined in the public/ directory.
Change-Id: I7806eacd986bef31bcebc1175dfafb5c8891b82d
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/65430
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdftext/cpdf_linkextract.cpp b/core/fpdftext/cpdf_linkextract.cpp
index fcd1d95..c9ca92e 100644
--- a/core/fpdftext/cpdf_linkextract.cpp
+++ b/core/fpdftext/cpdf_linkextract.cpp
@@ -122,13 +122,13 @@
const int nTotalChar = m_pTextPage->CountChars();
const WideString page_text = m_pTextPage->GetAllPageText();
while (pos < nTotalChar) {
- FPDF_CHAR_INFO pageChar;
- m_pTextPage->GetCharInfo(pos, &pageChar);
- if (pageChar.m_Flag != FPDFTEXT_CHAR_GENERATED &&
- pageChar.m_Unicode != TEXT_SPACE_CHAR && pos != nTotalChar - 1) {
- bAfterHyphen = (pageChar.m_Flag == FPDFTEXT_CHAR_HYPHEN ||
- (pageChar.m_Flag == FPDFTEXT_CHAR_NORMAL &&
- pageChar.m_Unicode == TEXT_HYPHEN_CHAR));
+ CPDF_TextPage::CharInfo char_info;
+ m_pTextPage->GetCharInfo(pos, &char_info);
+ if (char_info.m_Flag != FPDFTEXT_CHAR_GENERATED &&
+ char_info.m_Unicode != TEXT_SPACE_CHAR && pos != nTotalChar - 1) {
+ bAfterHyphen = (char_info.m_Flag == FPDFTEXT_CHAR_HYPHEN ||
+ (char_info.m_Flag == FPDFTEXT_CHAR_NORMAL &&
+ char_info.m_Unicode == TEXT_HYPHEN_CHAR));
++pos;
continue;
}
@@ -136,8 +136,8 @@
int nCount = pos - start;
if (pos == nTotalChar - 1) {
++nCount;
- } else if (bAfterHyphen && (pageChar.m_Unicode == TEXT_LINEFEED_CHAR ||
- pageChar.m_Unicode == TEXT_RETURN_CHAR)) {
+ } else if (bAfterHyphen && (char_info.m_Unicode == TEXT_LINEFEED_CHAR ||
+ char_info.m_Unicode == TEXT_RETURN_CHAR)) {
// Handle text breaks with a hyphen to the next line.
bLineBreak = true;
++pos;
diff --git a/core/fpdftext/cpdf_textpage.cpp b/core/fpdftext/cpdf_textpage.cpp
index 0701d84..789b60e 100644
--- a/core/fpdftext/cpdf_textpage.cpp
+++ b/core/fpdftext/cpdf_textpage.cpp
@@ -212,9 +212,9 @@
PDFTEXT_Obj::~PDFTEXT_Obj() {}
-FPDF_CHAR_INFO::FPDF_CHAR_INFO() {}
+CPDF_TextPage::CharInfo::CharInfo() = default;
-FPDF_CHAR_INFO::~FPDF_CHAR_INFO() {}
+CPDF_TextPage::CharInfo::~CharInfo() = default;
PAGECHAR_INFO::PAGECHAR_INFO() {}
@@ -451,7 +451,7 @@
});
}
-void CPDF_TextPage::GetCharInfo(size_t index, FPDF_CHAR_INFO* info) const {
+void CPDF_TextPage::GetCharInfo(size_t index, CharInfo* info) const {
if (!m_bIsParsed || index >= size())
return;
diff --git a/core/fpdftext/cpdf_textpage.h b/core/fpdftext/cpdf_textpage.h
index db53057..8207f70 100644
--- a/core/fpdftext/cpdf_textpage.h
+++ b/core/fpdftext/cpdf_textpage.h
@@ -40,21 +40,6 @@
enum class FPDFText_Direction { Left = -1, Right = 1 };
-class FPDF_CHAR_INFO {
- public:
- FPDF_CHAR_INFO();
- ~FPDF_CHAR_INFO();
-
- wchar_t m_Unicode = 0;
- wchar_t m_Charcode = 0;
- int32_t m_Flag = 0;
- float m_FontSize = 0;
- CFX_PointF m_Origin;
- CFX_FloatRect m_CharBox;
- UnownedPtr<CPDF_TextObject> m_pTextObj;
- CFX_Matrix m_Matrix;
-};
-
class PAGECHAR_INFO {
public:
PAGECHAR_INFO();
@@ -82,6 +67,21 @@
class CPDF_TextPage {
public:
+ class CharInfo {
+ public:
+ CharInfo();
+ ~CharInfo();
+
+ wchar_t m_Unicode = 0;
+ wchar_t m_Charcode = 0;
+ int32_t m_Flag = 0;
+ float m_FontSize = 0;
+ CFX_PointF m_Origin;
+ CFX_FloatRect m_CharBox;
+ UnownedPtr<CPDF_TextObject> m_pTextObj;
+ CFX_Matrix m_Matrix;
+ };
+
CPDF_TextPage(const CPDF_Page* pPage, FPDFText_Direction flags);
~CPDF_TextPage();
@@ -91,7 +91,7 @@
int TextIndexFromCharIndex(int CharIndex) const;
size_t size() const { return m_CharList.size(); }
int CountChars() const;
- void GetCharInfo(size_t index, FPDF_CHAR_INFO* info) const;
+ void GetCharInfo(size_t index, CharInfo* info) const;
std::vector<CFX_FloatRect> GetRectArray(int start, int nCount) const;
int GetIndexAtPos(const CFX_PointF& point, const CFX_SizeF& tolerance) const;
WideString GetTextByRect(const CFX_FloatRect& rect) const;
diff --git a/fpdfsdk/fpdf_text.cpp b/fpdfsdk/fpdf_text.cpp
index cbe411b..41d5614 100644
--- a/fpdfsdk/fpdf_text.cpp
+++ b/fpdfsdk/fpdf_text.cpp
@@ -73,7 +73,7 @@
if (!textpage)
return 0;
- FPDF_CHAR_INFO charinfo;
+ CPDF_TextPage::CharInfo charinfo;
textpage->GetCharInfo(index, &charinfo);
return charinfo.m_Unicode;
}
@@ -84,7 +84,7 @@
if (!textpage)
return 0;
- FPDF_CHAR_INFO charinfo;
+ CPDF_TextPage::CharInfo charinfo;
textpage->GetCharInfo(index, &charinfo);
return charinfo.m_FontSize;
}
@@ -99,7 +99,7 @@
if (!textpage)
return 0;
- FPDF_CHAR_INFO charinfo;
+ CPDF_TextPage::CharInfo charinfo;
textpage->GetCharInfo(index, &charinfo);
if (!charinfo.m_pTextObj)
return 0;
@@ -122,7 +122,7 @@
if (!textpage)
return -1;
- FPDF_CHAR_INFO charinfo;
+ CPDF_TextPage::CharInfo charinfo;
textpage->GetCharInfo(index, &charinfo);
if (!charinfo.m_pTextObj)
return -1;
@@ -136,7 +136,7 @@
if (!textpage)
return FPDF_TEXTRENDERMODE_UNKNOWN;
- FPDF_CHAR_INFO charinfo;
+ CPDF_TextPage::CharInfo charinfo;
textpage->GetCharInfo(index, &charinfo);
if (!charinfo.m_pTextObj)
return FPDF_TEXTRENDERMODE_UNKNOWN;
@@ -156,7 +156,7 @@
if (!textpage || !R || !G || !B || !A)
return false;
- FPDF_CHAR_INFO charinfo;
+ CPDF_TextPage::CharInfo charinfo;
textpage->GetCharInfo(index, &charinfo);
if (!charinfo.m_pTextObj)
return false;
@@ -181,7 +181,7 @@
if (!textpage || !R || !G || !B || !A)
return false;
- FPDF_CHAR_INFO charinfo;
+ CPDF_TextPage::CharInfo charinfo;
textpage->GetCharInfo(index, &charinfo);
if (!charinfo.m_pTextObj)
return false;
@@ -202,7 +202,7 @@
if (!textpage)
return -1.0f;
- FPDF_CHAR_INFO charinfo;
+ CPDF_TextPage::CharInfo charinfo;
textpage->GetCharInfo(index, &charinfo);
// On the left is our current Matrix and on the right a generic rotation
// matrix for our coordinate space.
@@ -230,7 +230,7 @@
if (!textpage)
return false;
- FPDF_CHAR_INFO charinfo;
+ CPDF_TextPage::CharInfo charinfo;
textpage->GetCharInfo(index, &charinfo);
*left = charinfo.m_CharBox.left;
*right = charinfo.m_CharBox.right;
@@ -248,7 +248,7 @@
if (!textpage)
return false;
- FPDF_CHAR_INFO charinfo;
+ CPDF_TextPage::CharInfo charinfo;
textpage->GetCharInfo(index, &charinfo);
if (charinfo.m_pTextObj && !IsFloatZero(charinfo.m_FontSize)) {
@@ -303,7 +303,7 @@
if (!textpage)
return false;
- FPDF_CHAR_INFO charinfo;
+ CPDF_TextPage::CharInfo charinfo;
textpage->GetCharInfo(index, &charinfo);
*x = charinfo.m_Origin.x;
*y = charinfo.m_Origin.y;
