summaryrefslogtreecommitdiff
path: root/core/include/fpdfapi
diff options
context:
space:
mode:
Diffstat (limited to 'core/include/fpdfapi')
-rw-r--r--core/include/fpdfapi/fpdf_module.h2
-rw-r--r--core/include/fpdfapi/fpdf_objects.h6
-rw-r--r--core/include/fpdfapi/fpdf_page.h12
-rw-r--r--core/include/fpdfapi/fpdf_pageobj.h36
-rw-r--r--core/include/fpdfapi/fpdf_parser.h5
-rw-r--r--core/include/fpdfapi/fpdf_render.h22
-rw-r--r--core/include/fpdfapi/fpdf_resource.h20
7 files changed, 50 insertions, 53 deletions
diff --git a/core/include/fpdfapi/fpdf_module.h b/core/include/fpdfapi/fpdf_module.h
index 5e99753d74..00aed45d1f 100644
--- a/core/include/fpdfapi/fpdf_module.h
+++ b/core/include/fpdfapi/fpdf_module.h
@@ -12,9 +12,9 @@
#include "third_party/base/nonstd_unique_ptr.h"
class CCodec_ModuleMgr;
-class CFX_AffineMatrix;
class CFX_BitmapDevice;
class CFX_DIBSource;
+class CFX_Matrix;
class CPDF_ColorSpace;
class CPDF_Dictionary;
class CPDF_DocPageData;
diff --git a/core/include/fpdfapi/fpdf_objects.h b/core/include/fpdfapi/fpdf_objects.h
index 532ede2a08..143e7d71c2 100644
--- a/core/include/fpdfapi/fpdf_objects.h
+++ b/core/include/fpdfapi/fpdf_objects.h
@@ -295,7 +295,7 @@ class CPDF_Array : public CPDF_Object {
CPDF_Object* GetElementValue(FX_DWORD index) const;
- CFX_AffineMatrix GetMatrix();
+ CFX_Matrix GetMatrix();
CFX_FloatRect GetRect();
@@ -400,7 +400,7 @@ class CPDF_Dictionary : public CPDF_Object {
CFX_FloatRect GetRect(const CFX_ByteStringC& key) const;
- CFX_AffineMatrix GetMatrix(const CFX_ByteStringC& key) const;
+ CFX_Matrix GetMatrix(const CFX_ByteStringC& key) const;
FX_FLOAT GetFloat(const CFX_ByteStringC& key) const { return GetNumber(key); }
@@ -436,7 +436,7 @@ class CPDF_Dictionary : public CPDF_Object {
void SetAtRect(const CFX_ByteStringC& key, const CFX_FloatRect& rect);
- void SetAtMatrix(const CFX_ByteStringC& key, const CFX_AffineMatrix& matrix);
+ void SetAtMatrix(const CFX_ByteStringC& key, const CFX_Matrix& matrix);
void SetAtBoolean(const CFX_ByteStringC& key, FX_BOOL bValue);
diff --git a/core/include/fpdfapi/fpdf_page.h b/core/include/fpdfapi/fpdf_page.h
index 6823dc1f96..5fa413d29c 100644
--- a/core/include/fpdfapi/fpdf_page.h
+++ b/core/include/fpdfapi/fpdf_page.h
@@ -63,7 +63,7 @@ class CPDF_PageObjects {
FX_POSITION InsertObject(FX_POSITION posInsertAfter,
CPDF_PageObject* pNewObject);
- void Transform(const CFX_AffineMatrix& matrix);
+ void Transform(const CFX_Matrix& matrix);
FX_BOOL BackgroundAlphaNeeded() const { return m_bBackgroundAlphaNeeded; }
@@ -109,7 +109,7 @@ class CPDF_Page : public CPDF_PageObjects, public CFX_PrivateData {
void ParseContent(CPDF_ParseOptions* pOptions = NULL,
FX_BOOL bReParse = FALSE);
- void GetDisplayMatrix(CFX_AffineMatrix& matrix,
+ void GetDisplayMatrix(CFX_Matrix& matrix,
int xPos,
int yPos,
int xSize,
@@ -122,7 +122,7 @@ class CPDF_Page : public CPDF_PageObjects, public CFX_PrivateData {
CFX_FloatRect GetPageBBox() const { return m_BBox; }
- const CFX_AffineMatrix& GetPageMatrix() const { return m_PageMatrix; }
+ const CFX_Matrix& GetPageMatrix() const { return m_PageMatrix; }
CPDF_Object* GetPageAttr(const CFX_ByteStringC& name) const;
@@ -137,7 +137,7 @@ class CPDF_Page : public CPDF_PageObjects, public CFX_PrivateData {
FX_FLOAT m_PageHeight;
- CFX_AffineMatrix m_PageMatrix;
+ CFX_Matrix m_PageMatrix;
CPDF_PageRenderCache* m_pPageRender;
};
@@ -163,13 +163,13 @@ class CPDF_Form : public CPDF_PageObjects {
~CPDF_Form();
void StartParse(CPDF_AllStates* pGraphicStates,
- CFX_AffineMatrix* pParentMatrix,
+ CFX_Matrix* pParentMatrix,
CPDF_Type3Char* pType3Char,
CPDF_ParseOptions* pOptions,
int level = 0);
void ParseContent(CPDF_AllStates* pGraphicStates,
- CFX_AffineMatrix* pParentMatrix,
+ CFX_Matrix* pParentMatrix,
CPDF_Type3Char* pType3Char,
CPDF_ParseOptions* pOptions,
int level = 0);
diff --git a/core/include/fpdfapi/fpdf_pageobj.h b/core/include/fpdfapi/fpdf_pageobj.h
index 886930ffe7..2b6f78e63f 100644
--- a/core/include/fpdfapi/fpdf_pageobj.h
+++ b/core/include/fpdfapi/fpdf_pageobj.h
@@ -52,11 +52,9 @@ class CPDF_Path : public CFX_CountRef<CFX_PathData> {
return m_pObject->GetBoundingBox(line_width, miter_limit);
}
- void Transform(const CFX_AffineMatrix* pMatrix) {
- GetModify()->Transform(pMatrix);
- }
+ void Transform(const CFX_Matrix* pMatrix) { GetModify()->Transform(pMatrix); }
- void Append(CPDF_Path src, const CFX_AffineMatrix* pMatrix) {
+ void Append(CPDF_Path src, const CFX_Matrix* pMatrix) {
m_pObject->Append(src.m_pObject, pMatrix);
}
@@ -109,7 +107,7 @@ class CPDF_ClipPath : public CFX_CountRef<CPDF_ClipPathData> {
void AppendTexts(CPDF_TextObject** pTexts, int count);
- void Transform(const CFX_AffineMatrix& matrix);
+ void Transform(const CFX_Matrix& matrix);
};
class CPDF_ColorStateData {
public:
@@ -362,7 +360,7 @@ class CPDF_PageObject : public CPDF_GraphicStates {
void Copy(const CPDF_PageObject* pSrcObject);
- virtual void Transform(const CFX_AffineMatrix& matrix) = 0;
+ virtual void Transform(const CFX_Matrix& matrix) = 0;
void RemoveClipPath();
@@ -370,13 +368,13 @@ class CPDF_PageObject : public CPDF_GraphicStates {
void CopyClipPath(CPDF_PageObject* pObj);
- void TransformClipPath(CFX_AffineMatrix& matrix);
+ void TransformClipPath(CFX_Matrix& matrix);
- void TransformGeneralState(CFX_AffineMatrix& matrix);
+ void TransformGeneralState(CFX_Matrix& matrix);
void SetColorState(CPDF_ColorState state) { m_ColorState = state; }
- FX_RECT GetBBox(const CFX_AffineMatrix* pMatrix) const;
+ FX_RECT GetBBox(const CFX_Matrix* pMatrix) const;
int m_Type;
@@ -427,7 +425,7 @@ class CPDF_TextObject : public CPDF_PageObject {
FX_FLOAT GetPosY() const { return m_PosY; }
- void GetTextMatrix(CFX_AffineMatrix* pMatrix) const;
+ void GetTextMatrix(CFX_Matrix* pMatrix) const;
CPDF_Font* GetFont() const { return m_TextState.GetFont(); }
@@ -446,7 +444,7 @@ class CPDF_TextObject : public CPDF_PageObject {
void SetTextState(CPDF_TextState TextState);
// CPDF_PageObject:
- void Transform(const CFX_AffineMatrix& matrix) override;
+ void Transform(const CFX_Matrix& matrix) override;
void CalcCharPos(FX_FLOAT* pPosArray) const;
@@ -495,7 +493,7 @@ class CPDF_PathObject : public CPDF_PageObject {
CPDF_PathObject() { m_Type = PDFPAGE_PATH; }
~CPDF_PathObject() override {}
- void Transform(const CFX_AffineMatrix& maxtrix) override;
+ void Transform(const CFX_Matrix& maxtrix) override;
void SetGraphState(CPDF_GraphState GraphState);
@@ -507,7 +505,7 @@ class CPDF_PathObject : public CPDF_PageObject {
FX_BOOL m_bStroke;
- CFX_AffineMatrix m_Matrix;
+ CFX_Matrix m_Matrix;
protected:
void CopyData(const CPDF_PageObject* pSrcObject) override;
@@ -518,11 +516,11 @@ class CPDF_ImageObject : public CPDF_PageObject {
CPDF_ImageObject();
~CPDF_ImageObject() override;
- void Transform(const CFX_AffineMatrix& matrix) override;
+ void Transform(const CFX_Matrix& matrix) override;
CPDF_Image* m_pImage;
- CFX_AffineMatrix m_Matrix;
+ CFX_Matrix m_Matrix;
void CalcBoundingBox();
@@ -537,9 +535,9 @@ class CPDF_ShadingObject : public CPDF_PageObject {
CPDF_ShadingPattern* m_pShading;
- CFX_AffineMatrix m_Matrix;
+ CFX_Matrix m_Matrix;
- void Transform(const CFX_AffineMatrix& matrix) override;
+ void Transform(const CFX_Matrix& matrix) override;
void CalcBoundingBox();
@@ -555,11 +553,11 @@ class CPDF_FormObject : public CPDF_PageObject {
}
~CPDF_FormObject() override;
- void Transform(const CFX_AffineMatrix& matrix) override;
+ void Transform(const CFX_Matrix& matrix) override;
CPDF_Form* m_pForm;
- CFX_AffineMatrix m_FormMatrix;
+ CFX_Matrix m_FormMatrix;
void CalcBoundingBox();
diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h
index dab0719f26..ad85de4c9a 100644
--- a/core/include/fpdfapi/fpdf_parser.h
+++ b/core/include/fpdfapi/fpdf_parser.h
@@ -15,10 +15,10 @@
class CFDF_Document;
class CFDF_Parser;
-class CFX_AffineMatrix;
class CFX_DIBSource;
class CFX_FloatRect;
class CFX_Font;
+class CFX_Matrix;
class CFX_PrivateData;
class CPDF_ColorSpace;
class CPDF_CryptoHandler;
@@ -122,7 +122,7 @@ class CPDF_Document : public CFX_PrivateData, public CPDF_IndirectObjects {
CPDF_Pattern* LoadPattern(CPDF_Object* pObj,
FX_BOOL bShading,
- const CFX_AffineMatrix* matrix = NULL);
+ const CFX_Matrix* matrix = NULL);
CPDF_Image* LoadImageF(CPDF_Object* pObj);
@@ -789,7 +789,6 @@ class CPDF_Point {
};
#define CPDF_Rect CFX_FloatRect
-#define CPDF_Matrix CFX_AffineMatrix
CFX_ByteString PDF_NameDecode(const CFX_ByteStringC& orig);
CFX_ByteString PDF_NameDecode(const CFX_ByteString& orig);
CFX_ByteString PDF_NameEncode(const CFX_ByteString& orig);
diff --git a/core/include/fpdfapi/fpdf_render.h b/core/include/fpdfapi/fpdf_render.h
index 8d87b588c1..d7fdbd463d 100644
--- a/core/include/fpdfapi/fpdf_render.h
+++ b/core/include/fpdfapi/fpdf_render.h
@@ -94,21 +94,21 @@ class CPDF_RenderContext {
void Clear();
void AppendObjectList(CPDF_PageObjects* pObjs,
- const CFX_AffineMatrix* pObject2Device);
+ const CFX_Matrix* pObject2Device);
void Render(CFX_RenderDevice* pDevice,
const CPDF_RenderOptions* pOptions = NULL,
- const CFX_AffineMatrix* pFinalMatrix = NULL);
+ const CFX_Matrix* pFinalMatrix = NULL);
void DrawObjectList(CFX_RenderDevice* pDevice,
CPDF_PageObjects* pObjs,
- const CFX_AffineMatrix* pObject2Device,
+ const CFX_Matrix* pObject2Device,
const CPDF_RenderOptions* pOptions);
void GetBackground(CFX_DIBitmap* pBuffer,
const CPDF_PageObject* pObj,
const CPDF_RenderOptions* pOptions,
- CFX_AffineMatrix* pFinalMatrix);
+ CFX_Matrix* pFinalMatrix);
CPDF_PageRenderCache* GetPageCache() const { return m_pPageCache; }
@@ -126,7 +126,7 @@ class CPDF_RenderContext {
void Render(CFX_RenderDevice* pDevice,
const CPDF_PageObject* pStopObj,
const CPDF_RenderOptions* pOptions,
- const CFX_AffineMatrix* pFinalMatrix);
+ const CFX_Matrix* pFinalMatrix);
friend class CPDF_RenderStatus;
friend class CPDF_ProgressiveRenderer;
};
@@ -185,7 +185,7 @@ class CPDF_TextRenderer {
FX_FLOAT origin_y,
CPDF_Font* pFont,
FX_FLOAT font_size,
- const CFX_AffineMatrix* matrix,
+ const CFX_Matrix* matrix,
const CFX_ByteString& str,
FX_ARGB fill_argb,
FX_ARGB stroke_argb = 0,
@@ -198,8 +198,8 @@ class CPDF_TextRenderer {
FX_FLOAT* pCharPos,
CPDF_Font* pFont,
FX_FLOAT font_size,
- const CFX_AffineMatrix* pText2User,
- const CFX_AffineMatrix* pUser2Device,
+ const CFX_Matrix* pText2User,
+ const CFX_Matrix* pUser2Device,
const CFX_GraphStateData* pGraphState,
FX_ARGB fill_argb,
FX_ARGB stroke_argb,
@@ -212,7 +212,7 @@ class CPDF_TextRenderer {
FX_FLOAT* pCharPos,
CPDF_Font* pFont,
FX_FLOAT font_size,
- const CFX_AffineMatrix* pText2Device,
+ const CFX_Matrix* pText2Device,
FX_ARGB fill_argb,
const CPDF_RenderOptions* pOptions);
@@ -222,7 +222,7 @@ class CPDF_TextRenderer {
FX_FLOAT* pCharPos,
CPDF_Font* pFont,
FX_FLOAT font_size,
- const CFX_AffineMatrix* pText2Device,
+ const CFX_Matrix* pText2Device,
FX_ARGB fill_argb);
};
class CPDF_PageRenderCache {
@@ -288,6 +288,6 @@ class CPDF_RenderConfig {
int m_RenderStepLimit;
};
-FX_BOOL IsAvailableMatrix(const CFX_AffineMatrix& matrix);
+FX_BOOL IsAvailableMatrix(const CFX_Matrix& matrix);
#endif // CORE_INCLUDE_FPDFAPI_FPDF_RENDER_H_
diff --git a/core/include/fpdfapi/fpdf_resource.h b/core/include/fpdfapi/fpdf_resource.h
index 6c39e381f5..1f6c8b005b 100644
--- a/core/include/fpdfapi/fpdf_resource.h
+++ b/core/include/fpdfapi/fpdf_resource.h
@@ -377,7 +377,7 @@ class CPDF_Type3Char {
CFX_DIBitmap* m_pBitmap;
FX_BOOL m_bColored;
int m_Width;
- CFX_AffineMatrix m_ImageMatrix;
+ CFX_Matrix m_ImageMatrix;
FX_RECT m_BBox;
};
@@ -395,11 +395,11 @@ class CPDF_Type3Font : public CPDF_SimpleFont {
return GetCharWidthF(charcode);
}
void GetCharBBox(FX_DWORD charcode, FX_RECT& rect, int level = 0) override;
- CFX_AffineMatrix& GetFontMatrix() { return m_FontMatrix; }
+ CFX_Matrix& GetFontMatrix() { return m_FontMatrix; }
void CheckType3FontMetrics();
protected:
- CFX_AffineMatrix m_FontMatrix;
+ CFX_Matrix m_FontMatrix;
private:
FX_BOOL _Load() override;
@@ -647,13 +647,13 @@ class CPDF_Pattern {
int m_PatternType;
- CFX_AffineMatrix m_Pattern2Form;
- CFX_AffineMatrix m_ParentMatrix;
+ CFX_Matrix m_Pattern2Form;
+ CFX_Matrix m_ParentMatrix;
CPDF_Document* m_pDocument;
protected:
- CPDF_Pattern(const CFX_AffineMatrix* pParentMatrix);
+ CPDF_Pattern(const CFX_Matrix* pParentMatrix);
FX_BOOL m_bForceClear;
};
@@ -661,7 +661,7 @@ class CPDF_TilingPattern : public CPDF_Pattern {
public:
CPDF_TilingPattern(CPDF_Document* pDoc,
CPDF_Object* pPatternObj,
- const CFX_AffineMatrix* parentMatrix);
+ const CFX_Matrix* parentMatrix);
~CPDF_TilingPattern() override;
@@ -695,7 +695,7 @@ class CPDF_ShadingPattern : public CPDF_Pattern {
CPDF_ShadingPattern(CPDF_Document* pDoc,
CPDF_Object* pPatternObj,
FX_BOOL bShading,
- const CFX_AffineMatrix* parentMatrix);
+ const CFX_Matrix* parentMatrix);
~CPDF_ShadingPattern() override;
@@ -746,11 +746,11 @@ class CPDF_MeshStream {
void GetColor(FX_FLOAT& r, FX_FLOAT& g, FX_FLOAT& b);
- FX_DWORD GetVertex(CPDF_MeshVertex& vertex, CFX_AffineMatrix* pObject2Bitmap);
+ FX_DWORD GetVertex(CPDF_MeshVertex& vertex, CFX_Matrix* pObject2Bitmap);
FX_BOOL GetVertexRow(CPDF_MeshVertex* vertex,
int count,
- CFX_AffineMatrix* pObject2Bitmap);
+ CFX_Matrix* pObject2Bitmap);
CPDF_Function** m_pFuncs;
CPDF_ColorSpace* m_pCS;
FX_DWORD m_nFuncs, m_nCoordBits, m_nCompBits, m_nFlagBits, m_nComps;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 01:07:08 +0000