summaryrefslogtreecommitdiff
path: root/core/src
diff options
context:
space:
mode:
Diffstat (limited to 'core/src')
-rw-r--r--core/src/fpdfapi/fpdf_page/fpdf_page.cpp20
-rw-r--r--core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp2
-rw-r--r--core/src/fpdfapi/fpdf_page/pageint.h8
-rw-r--r--core/src/fpdfapi/fpdf_render/fpdf_render.cpp6
-rw-r--r--core/src/fpdfapi/fpdf_render/render_int.h4
-rw-r--r--core/src/fpdftext/fpdf_text_search.cpp2
-rw-r--r--core/src/fpdftext/text_int.h4
7 files changed, 23 insertions, 23 deletions
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page.cpp
index 1d18b5343d..b1bd277bb5 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page.cpp
+++ b/core/src/fpdfapi/fpdf_page/fpdf_page.cpp
@@ -666,7 +666,7 @@ void CPDF_FormObject::CalcBoundingBox() {
m_Right = form_rect.right;
m_Top = form_rect.top;
}
-CPDF_PageObjects::CPDF_PageObjects()
+CPDF_PageObjectList::CPDF_PageObjectList()
: m_pFormDict(nullptr),
m_pFormStream(nullptr),
m_pDocument(nullptr),
@@ -677,13 +677,13 @@ CPDF_PageObjects::CPDF_PageObjects()
m_bHasImageMask(FALSE),
m_ParseState(CONTENT_NOT_PARSED),
m_ObjectList(128) {}
-CPDF_PageObjects::~CPDF_PageObjects() {
+CPDF_PageObjectList::~CPDF_PageObjectList() {
FX_POSITION pos = m_ObjectList.GetHeadPosition();
while (pos) {
delete (CPDF_PageObject*)m_ObjectList.GetNext(pos);
}
}
-void CPDF_PageObjects::ContinueParse(IFX_Pause* pPause) {
+void CPDF_PageObjectList::ContinueParse(IFX_Pause* pPause) {
if (!m_pParser) {
return;
}
@@ -693,14 +693,14 @@ void CPDF_PageObjects::ContinueParse(IFX_Pause* pPause) {
m_pParser.reset();
}
}
-FX_POSITION CPDF_PageObjects::InsertObject(FX_POSITION posInsertAfter,
- CPDF_PageObject* pNewObject) {
+FX_POSITION CPDF_PageObjectList::InsertObject(FX_POSITION posInsertAfter,
+ CPDF_PageObject* pNewObject) {
if (!posInsertAfter) {
return m_ObjectList.AddHead(pNewObject);
}
return m_ObjectList.InsertAfter(posInsertAfter, pNewObject);
}
-int CPDF_PageObjects::GetObjectIndex(CPDF_PageObject* pObj) const {
+int CPDF_PageObjectList::GetObjectIndex(CPDF_PageObject* pObj) const {
int index = 0;
FX_POSITION pos = m_ObjectList.GetHeadPosition();
while (pos) {
@@ -712,18 +712,18 @@ int CPDF_PageObjects::GetObjectIndex(CPDF_PageObject* pObj) const {
}
return -1;
}
-CPDF_PageObject* CPDF_PageObjects::GetObjectByIndex(int index) const {
+CPDF_PageObject* CPDF_PageObjectList::GetObjectByIndex(int index) const {
FX_POSITION pos = m_ObjectList.FindIndex(index);
return pos ? static_cast<CPDF_PageObject*>(m_ObjectList.GetAt(pos)) : nullptr;
}
-void CPDF_PageObjects::Transform(const CFX_Matrix& matrix) {
+void CPDF_PageObjectList::Transform(const CFX_Matrix& matrix) {
FX_POSITION pos = m_ObjectList.GetHeadPosition();
while (pos) {
CPDF_PageObject* pObj = (CPDF_PageObject*)m_ObjectList.GetNext(pos);
pObj->Transform(matrix);
}
}
-CFX_FloatRect CPDF_PageObjects::CalcBoundingBox() const {
+CFX_FloatRect CPDF_PageObjectList::CalcBoundingBox() const {
if (m_ObjectList.GetCount() == 0) {
return CFX_FloatRect(0, 0, 0, 0);
}
@@ -748,7 +748,7 @@ CFX_FloatRect CPDF_PageObjects::CalcBoundingBox() const {
}
return CFX_FloatRect(left, bottom, right, top);
}
-void CPDF_PageObjects::LoadTransInfo() {
+void CPDF_PageObjectList::LoadTransInfo() {
if (!m_pFormDict) {
return;
}
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp
index 08b10e5500..c5e407d4ea 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp
+++ b/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp
@@ -114,7 +114,7 @@ CPDF_StreamContentParser::CPDF_StreamContentParser(
CPDF_Dictionary* pPageResources,
CPDF_Dictionary* pParentResources,
CFX_Matrix* pmtContentToUser,
- CPDF_PageObjects* pObjList,
+ CPDF_PageObjectList* pObjList,
CPDF_Dictionary* pResources,
CPDF_Rect* pBBox,
CPDF_ParseOptions* pOptions,
diff --git a/core/src/fpdfapi/fpdf_page/pageint.h b/core/src/fpdfapi/fpdf_page/pageint.h
index 49f7a0e42c..3d33387e2d 100644
--- a/core/src/fpdfapi/fpdf_page/pageint.h
+++ b/core/src/fpdfapi/fpdf_page/pageint.h
@@ -93,7 +93,7 @@ class CPDF_StreamContentParser {
CPDF_Dictionary* pPageResources,
CPDF_Dictionary* pParentResources,
CFX_Matrix* pmtContentToUser,
- CPDF_PageObjects* pObjList,
+ CPDF_PageObjectList* pObjList,
CPDF_Dictionary* pResources,
CFX_FloatRect* pBBox,
CPDF_ParseOptions* pOptions,
@@ -101,7 +101,7 @@ class CPDF_StreamContentParser {
int level);
~CPDF_StreamContentParser();
- CPDF_PageObjects* GetObjectList() const { return m_pObjectList; }
+ CPDF_PageObjectList* GetObjectList() const { return m_pObjectList; }
CPDF_AllStates* GetCurStates() const { return m_pCurStates.get(); }
FX_BOOL IsColored() const { return m_bColored; }
const FX_FLOAT* GetType3Data() const { return m_Type3Data; }
@@ -235,7 +235,7 @@ class CPDF_StreamContentParser {
CPDF_Dictionary* m_pPageResources;
CPDF_Dictionary* m_pParentResources;
CPDF_Dictionary* m_pResources;
- CPDF_PageObjects* m_pObjectList;
+ CPDF_PageObjectList* m_pObjectList;
int m_Level;
CFX_Matrix m_mtContentToUser;
CFX_FloatRect m_BBox;
@@ -297,7 +297,7 @@ class CPDF_ContentParser {
ParseStatus m_Status;
InternalStage m_InternalStage;
- CPDF_PageObjects* m_pObjects;
+ CPDF_PageObjectList* m_pObjects;
FX_BOOL m_bForm;
CPDF_ParseOptions m_Options;
CPDF_Type3Char* m_pType3Char;
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render.cpp
index 6a821ec069..5222d69fde 100644
--- a/core/src/fpdfapi/fpdf_render/fpdf_render.cpp
+++ b/core/src/fpdfapi/fpdf_render/fpdf_render.cpp
@@ -240,7 +240,7 @@ FX_BOOL CPDF_RenderStatus::Initialize(CPDF_RenderContext* pContext,
m_Transparency = transparency;
return TRUE;
}
-void CPDF_RenderStatus::RenderObjectList(const CPDF_PageObjects* pObjs,
+void CPDF_RenderStatus::RenderObjectList(const CPDF_PageObjectList* pObjs,
const CFX_Matrix* pObj2Device) {
CFX_FloatRect clip_rect = m_pDevice->GetClipBox();
CFX_Matrix device2object;
@@ -968,7 +968,7 @@ CPDF_RenderContext::CPDF_RenderContext(CPDF_Document* pDoc,
m_pPageCache(pPageCache),
m_bFirstLayer(TRUE) {}
CPDF_RenderContext::~CPDF_RenderContext() {}
-void CPDF_RenderContext::AppendObjectList(CPDF_PageObjects* pObjs,
+void CPDF_RenderContext::AppendObjectList(CPDF_PageObjectList* pObjs,
const CFX_Matrix* pObject2Device) {
_PDF_RenderItem* pItem = m_ContentList.AddSpace();
pItem->m_pObjectList = pObjs;
@@ -1023,7 +1023,7 @@ void CPDF_RenderContext::Render(CFX_RenderDevice* pDevice,
}
}
void CPDF_RenderContext::DrawObjectList(CFX_RenderDevice* pDevice,
- CPDF_PageObjects* pObjs,
+ CPDF_PageObjectList* pObjs,
const CFX_Matrix* pObject2Device,
const CPDF_RenderOptions* pOptions) {
AppendObjectList(pObjs, pObject2Device);
diff --git a/core/src/fpdfapi/fpdf_render/render_int.h b/core/src/fpdfapi/fpdf_render/render_int.h
index 5530754ab0..3a81ba5587 100644
--- a/core/src/fpdfapi/fpdf_render/render_int.h
+++ b/core/src/fpdfapi/fpdf_render/render_int.h
@@ -93,7 +93,7 @@ class CPDF_DocRenderData {
};
struct _PDF_RenderItem {
public:
- CPDF_PageObjects* m_pObjectList;
+ CPDF_PageObjectList* m_pObjectList;
CFX_Matrix m_Matrix;
};
@@ -131,7 +131,7 @@ class CPDF_RenderStatus {
FX_ARGB fill_color = 0,
FX_DWORD GroupFamily = 0,
FX_BOOL bLoadMask = FALSE);
- void RenderObjectList(const CPDF_PageObjects* pObjs,
+ void RenderObjectList(const CPDF_PageObjectList* pObjs,
const CFX_Matrix* pObj2Device);
void RenderSingleObject(const CPDF_PageObject* pObj,
const CFX_Matrix* pObj2Device);
diff --git a/core/src/fpdftext/fpdf_text_search.cpp b/core/src/fpdftext/fpdf_text_search.cpp
index 80bf5ec99a..de38a7f540 100644
--- a/core/src/fpdftext/fpdf_text_search.cpp
+++ b/core/src/fpdftext/fpdf_text_search.cpp
@@ -296,7 +296,7 @@ FX_BOOL CPDF_TextStream::ProcessObject(const CPDF_TextObject* pObj,
return FALSE;
}
void GetTextStream_Unicode(CFX_WideTextBuf& buffer,
- CPDF_PageObjects* pPage,
+ CPDF_PageObjectList* pPage,
FX_BOOL bUseLF,
CFX_PtrArray* pObjArray) {
CPDF_TextStream textstream(buffer, bUseLF, pObjArray);
diff --git a/core/src/fpdftext/text_int.h b/core/src/fpdftext/text_int.h
index bc3cc5bacf..acc9bfacc6 100644
--- a/core/src/fpdftext/text_int.h
+++ b/core/src/fpdftext/text_int.h
@@ -133,7 +133,7 @@ class CPDF_TextPage : public IPDF_TextPage {
CPDFText_ParseOptions m_ParseOptions;
CFX_WordArray m_CharIndex;
- const CPDF_PageObjects* const m_pPage;
+ const CPDF_PageObjectList* const m_pPage;
PAGECHAR_InfoArray m_charList;
CFX_WideTextBuf m_TextBuf;
PAGECHAR_InfoArray m_TempCharList;
@@ -241,7 +241,7 @@ FX_STRSIZE FX_Unicode_GetNormalization(FX_WCHAR wch, FX_WCHAR* pDst);
void NormalizeString(CFX_WideString& str);
void NormalizeCompositeChar(FX_WCHAR wChar, CFX_WideString& sDest);
void GetTextStream_Unicode(CFX_WideTextBuf& buffer,
- CPDF_PageObjects* pPage,
+ CPDF_PageObjectList* pPage,
FX_BOOL bUseLF,
CFX_PtrArray* pObjArray);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 20:48:58 +0000