summaryrefslogtreecommitdiff
path: root/core/fpdftext/include
diff options
context:
space:
mode:
Diffstat (limited to 'core/fpdftext/include')
-rw-r--r--core/fpdftext/include/cpdf_linkextract.h2
-rw-r--r--core/fpdftext/include/cpdf_textpage.h8
-rw-r--r--core/fpdftext/include/cpdf_textpagefind.h3
3 files changed, 6 insertions, 7 deletions
diff --git a/core/fpdftext/include/cpdf_linkextract.h b/core/fpdftext/include/cpdf_linkextract.h
index 4f9537c799..5d471e0f1c 100644
--- a/core/fpdftext/include/cpdf_linkextract.h
+++ b/core/fpdftext/include/cpdf_linkextract.h
@@ -24,7 +24,7 @@ class CPDF_LinkExtract {
void ExtractLinks();
size_t CountLinks() const { return m_LinkArray.size(); }
CFX_WideString GetURL(size_t index) const;
- void GetRects(size_t index, CFX_RectArray* pRects) const;
+ std::vector<CFX_FloatRect> GetRects(size_t index) const;
protected:
void ParseLink();
diff --git a/core/fpdftext/include/cpdf_textpage.h b/core/fpdftext/include/cpdf_textpage.h
index 8d608b0bf0..1a60a2351d 100644
--- a/core/fpdftext/include/cpdf_textpage.h
+++ b/core/fpdftext/include/cpdf_textpage.h
@@ -67,7 +67,7 @@ class CPDF_TextPage {
int TextIndexFromCharIndex(int CharIndex) const;
int CountChars() const;
void GetCharInfo(int index, FPDF_CHAR_INFO* info) const;
- void GetRectArray(int start, int nCount, CFX_RectArray* rectArray) const;
+ std::vector<CFX_FloatRect> GetRectArray(int start, int nCount) const;
int GetIndexAtPos(CFX_FloatPoint point,
FX_FLOAT xTolerance,
FX_FLOAT yTolerance) const;
@@ -76,8 +76,8 @@ class CPDF_TextPage {
FX_FLOAT xTolerance,
FX_FLOAT yTolerance) const;
CFX_WideString GetTextByRect(const CFX_FloatRect& rect) const;
- void GetRectsArrayByRect(const CFX_FloatRect& rect,
- CFX_RectArray& resRectArray) const;
+ std::vector<CFX_FloatRect> GetRectsArrayByRect(
+ const CFX_FloatRect& rect) const;
CFX_WideString GetPageText(int start = 0, int nCount = -1) const;
int CountRects(int start, int nCount);
void GetRect(int rectIndex,
@@ -146,7 +146,7 @@ class CPDF_TextPage {
bool m_bIsParsed;
CFX_Matrix m_DisplayMatrix;
CFX_ArrayTemplate<FPDF_SEGMENT> m_Segments;
- CFX_RectArray m_SelRects;
+ std::vector<CFX_FloatRect> m_SelRects;
CFX_ArrayTemplate<PDFTEXT_Obj> m_LineObj;
int32_t m_TextlineDir;
CFX_FloatRect m_CurlineRect;
diff --git a/core/fpdftext/include/cpdf_textpagefind.h b/core/fpdftext/include/cpdf_textpagefind.h
index ec739e4896..d9937772d1 100644
--- a/core/fpdftext/include/cpdf_textpagefind.h
+++ b/core/fpdftext/include/cpdf_textpagefind.h
@@ -25,7 +25,6 @@ class CPDF_TextPageFind {
int startPos = 0);
FX_BOOL FindNext();
FX_BOOL FindPrev();
- void GetRectArray(CFX_RectArray& rects) const;
int GetCurOrder() const;
int GetMatchedCount() const;
@@ -58,7 +57,7 @@ class CPDF_TextPageFind {
FX_BOOL m_bMatchWholeWord;
int m_resStart;
int m_resEnd;
- CFX_RectArray m_resArray;
+ std::vector<CFX_FloatRect> m_resArray;
FX_BOOL m_IsFind;
};