From 60d909e9d4444b2b8582275624ee97734d331a38 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 10 Dec 2015 15:34:55 -0800 Subject: Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix Review URL: https://codereview.chromium.org/1513363002 . (cherry picked from commit f32c969bce6743fca1e7ff796b54a1692d26d7f0) R=thestig@chromium.org Review URL: https://codereview.chromium.org/1519693002 . --- core/include/fpdfapi/fpdf_module.h | 2 +- core/include/fpdfapi/fpdf_objects.h | 6 ++--- core/include/fpdfapi/fpdf_page.h | 12 +++++----- core/include/fpdfapi/fpdf_pageobj.h | 36 ++++++++++++++--------------- core/include/fpdfapi/fpdf_parser.h | 5 ++-- core/include/fpdfapi/fpdf_render.h | 22 +++++++++--------- core/include/fpdfapi/fpdf_resource.h | 20 ++++++++-------- core/include/fpdfdoc/fpdf_doc.h | 16 ++++++------- core/include/fpdftext/fpdf_text.h | 2 +- core/include/fxcrt/fx_coordinates.h | 1 - core/include/fxge/fx_dib.h | 12 +++++----- core/include/fxge/fx_font.h | 8 +++---- core/include/fxge/fx_ge.h | 44 ++++++++++++++++++------------------ 13 files changed, 91 insertions(+), 95 deletions(-) (limited to 'core/include') 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 { 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 { 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; diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h index 3922e1c867..75150eb2f6 100644 --- a/core/include/fpdfdoc/fpdf_doc.h +++ b/core/include/fpdfdoc/fpdf_doc.h @@ -402,19 +402,19 @@ class CPDF_Annot : public CFX_PrivateData { FX_BOOL DrawAppearance(const CPDF_Page* pPage, CFX_RenderDevice* pDevice, - const CFX_AffineMatrix* pUser2Device, + const CFX_Matrix* pUser2Device, AppearanceMode mode, const CPDF_RenderOptions* pOptions); FX_BOOL DrawInContext(const CPDF_Page* pPage, const CPDF_RenderContext* pContext, - const CFX_AffineMatrix* pUser2Device, + const CFX_Matrix* pUser2Device, AppearanceMode mode); void ClearCachedAP(); void DrawBorder(CFX_RenderDevice* pDevice, - const CFX_AffineMatrix* pUser2Device, + const CFX_Matrix* pUser2Device, const CPDF_RenderOptions* pOptions); CPDF_Form* GetAPForm(const CPDF_Page* pPage, AppearanceMode mode); @@ -437,7 +437,7 @@ class CPDF_AnnotList { void DisplayAnnots(const CPDF_Page* pPage, CPDF_RenderContext* pContext, FX_BOOL bPrinting, - CFX_AffineMatrix* pMatrix, + CFX_Matrix* pMatrix, FX_BOOL bShowWidget, CPDF_RenderOptions* pOptions) { DisplayAnnots(pPage, nullptr, pContext, bPrinting, pMatrix, @@ -447,7 +447,7 @@ class CPDF_AnnotList { CFX_RenderDevice* pDevice, CPDF_RenderContext* pContext, FX_BOOL bPrinting, - CFX_AffineMatrix* pMatrix, + CFX_Matrix* pMatrix, FX_DWORD dwAnnotFlags, CPDF_RenderOptions* pOptions, FX_RECT* pClipRect); @@ -461,7 +461,7 @@ class CPDF_AnnotList { CFX_RenderDevice* pDevice, CPDF_RenderContext* pContext, FX_BOOL bPrinting, - CFX_AffineMatrix* pMatrix, + CFX_Matrix* pMatrix, FX_BOOL bWidget, CPDF_RenderOptions* pOptions, FX_RECT* clip_rect); @@ -517,7 +517,7 @@ class CPDF_DefaultAppearance { CFX_ByteString GetTextMatrixString(); - CFX_AffineMatrix GetTextMatrix(); + CFX_Matrix GetTextMatrix(); protected: CFX_ByteString m_csDA; @@ -915,7 +915,7 @@ class CPDF_FormControl { CFX_FloatRect GetRect() const; void DrawControl(CFX_RenderDevice* pDevice, - CFX_AffineMatrix* pMatrix, + CFX_Matrix* pMatrix, CPDF_Page* pPage, CPDF_Annot::AppearanceMode mode, const CPDF_RenderOptions* pOptions = NULL); diff --git a/core/include/fpdftext/fpdf_text.h b/core/include/fpdftext/fpdf_text.h index 360e256ce6..1b3ac0da00 100644 --- a/core/include/fpdftext/fpdf_text.h +++ b/core/include/fpdftext/fpdf_text.h @@ -51,7 +51,7 @@ typedef struct { FX_FLOAT m_OriginY; CFX_FloatRect m_CharBox; CPDF_TextObject* m_pTextObj; - CFX_AffineMatrix m_Matrix; + CFX_Matrix m_Matrix; } FPDF_CHAR_INFO; typedef CFX_ArrayTemplate CFX_RectArray; #define FPDFTEXT_LRTB 0 diff --git a/core/include/fxcrt/fx_coordinates.h b/core/include/fxcrt/fx_coordinates.h index e7fbe8549b..bb8f2f71f8 100644 --- a/core/include/fxcrt/fx_coordinates.h +++ b/core/include/fxcrt/fx_coordinates.h @@ -741,6 +741,5 @@ class CFX_Matrix { FX_FLOAT e; FX_FLOAT f; }; -#define CFX_AffineMatrix CFX_Matrix #endif // CORE_INCLUDE_FXCRT_FX_COORDINATES_H_ diff --git a/core/include/fxge/fx_dib.h b/core/include/fxge/fx_dib.h index e57b3c9a83..f4f4fd2e6f 100644 --- a/core/include/fxge/fx_dib.h +++ b/core/include/fxge/fx_dib.h @@ -232,7 +232,7 @@ class CFX_DIBSource { FX_DWORD flags = 0, const FX_RECT* pClip = NULL) const; - CFX_DIBitmap* TransformTo(const CFX_AffineMatrix* pMatrix, + CFX_DIBitmap* TransformTo(const CFX_Matrix* pMatrix, int& left, int& top, FX_DWORD flags = 0, @@ -639,19 +639,19 @@ class CFX_ImageTransformer { ~CFX_ImageTransformer(); FX_BOOL Start(const CFX_DIBSource* pSrc, - const CFX_AffineMatrix* pMatrix, + const CFX_Matrix* pMatrix, int flags, const FX_RECT* pClip); FX_BOOL Continue(IFX_Pause* pPause); - CFX_AffineMatrix* m_pMatrix; + CFX_Matrix* m_pMatrix; FX_RECT m_StretchClip; int m_ResultLeft; int m_ResultTop; int m_ResultWidth; int m_ResultHeight; - CFX_AffineMatrix m_dest2stretch; + CFX_Matrix m_dest2stretch; CFX_ImageStretcher m_Stretcher; CFX_BitmapStorer m_Storer; FX_DWORD m_Flags; @@ -667,7 +667,7 @@ class CFX_ImageRenderer { const CFX_DIBSource* pSource, int bitmap_alpha, FX_DWORD mask_color, - const CFX_AffineMatrix* pMatrix, + const CFX_Matrix* pMatrix, FX_DWORD dib_flags, FX_BOOL bRgbByteOrder = FALSE, int alpha_flag = 0, @@ -681,7 +681,7 @@ class CFX_ImageRenderer { const CFX_ClipRgn* m_pClipRgn; int m_BitmapAlpha; FX_DWORD m_MaskColor; - CFX_AffineMatrix m_Matrix; + CFX_Matrix m_Matrix; CFX_ImageTransformer* m_pTransformer; CFX_ImageStretcher m_Stretcher; CFX_BitmapComposer m_Composer; diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h index 0f35115eee..dd0de401ef 100644 --- a/core/include/fxge/fx_font.h +++ b/core/include/fxge/fx_font.h @@ -473,7 +473,7 @@ class CFX_FaceCache { const CFX_GlyphBitmap* LoadGlyphBitmap(CFX_Font* pFont, FX_DWORD glyph_index, FX_BOOL bFontStyle, - const CFX_AffineMatrix* pMatrix, + const CFX_Matrix* pMatrix, int dest_width, int anti_alias, int& text_flags); @@ -485,16 +485,16 @@ class CFX_FaceCache { CFX_GlyphBitmap* RenderGlyph(CFX_Font* pFont, FX_DWORD glyph_index, FX_BOOL bFontStyle, - const CFX_AffineMatrix* pMatrix, + const CFX_Matrix* pMatrix, int dest_width, int anti_alias); CFX_GlyphBitmap* RenderGlyph_Nativetext(CFX_Font* pFont, FX_DWORD glyph_index, - const CFX_AffineMatrix* pMatrix, + const CFX_Matrix* pMatrix, int dest_width, int anti_alias); CFX_GlyphBitmap* LookUpGlyphBitmap(CFX_Font* pFont, - const CFX_AffineMatrix* pMatrix, + const CFX_Matrix* pMatrix, CFX_ByteStringC& FaceGlyphsKey, FX_DWORD glyph_index, FX_BOOL bFontStyle, diff --git a/core/include/fxge/fx_ge.h b/core/include/fxge/fx_ge.h index 4cfe622007..01a1c72a8f 100644 --- a/core/include/fxge/fx_ge.h +++ b/core/include/fxge/fx_ge.h @@ -136,18 +136,18 @@ class CFX_PathData { CFX_FloatRect GetBoundingBox(FX_FLOAT line_width, FX_FLOAT miter_limit) const; - void Transform(const CFX_AffineMatrix* pMatrix); + void Transform(const CFX_Matrix* pMatrix); FX_BOOL IsRect() const; FX_BOOL GetZeroAreaPath(CFX_PathData& NewPath, - CFX_AffineMatrix* pMatrix, + CFX_Matrix* pMatrix, FX_BOOL& bThin, FX_BOOL bAdjust) const; - FX_BOOL IsRect(const CFX_AffineMatrix* pMatrix, CFX_FloatRect* rect) const; + FX_BOOL IsRect(const CFX_Matrix* pMatrix, CFX_FloatRect* rect) const; - void Append(const CFX_PathData* pSrc, const CFX_AffineMatrix* pMatrix); + void Append(const CFX_PathData* pSrc, const CFX_Matrix* pMatrix); void AppendRect(FX_FLOAT left, FX_FLOAT bottom, FX_FLOAT right, FX_FLOAT top); void SetPoint(int index, FX_FLOAT x, FX_FLOAT y, int flag); @@ -281,17 +281,17 @@ class CFX_RenderDevice { const FX_RECT& GetClipBox() const { return m_ClipBox; } FX_BOOL SetClip_PathFill(const CFX_PathData* pPathData, - const CFX_AffineMatrix* pObject2Device, + const CFX_Matrix* pObject2Device, int fill_mode); FX_BOOL SetClip_Rect(const FX_RECT* pRect); FX_BOOL SetClip_PathStroke(const CFX_PathData* pPathData, - const CFX_AffineMatrix* pObject2Device, + const CFX_Matrix* pObject2Device, const CFX_GraphStateData* pGraphState); FX_BOOL DrawPath(const CFX_PathData* pPathData, - const CFX_AffineMatrix* pObject2Device, + const CFX_Matrix* pObject2Device, const CFX_GraphStateData* pGraphState, FX_DWORD fill_color, FX_DWORD stroke_color, @@ -364,7 +364,7 @@ class CFX_RenderDevice { FX_BOOL StartDIBits(const CFX_DIBSource* pBitmap, int bitmap_alpha, FX_DWORD color, - const CFX_AffineMatrix* pMatrix, + const CFX_Matrix* pMatrix, FX_DWORD flags, void*& handle, int alpha_flag = 0, @@ -380,7 +380,7 @@ class CFX_RenderDevice { CFX_Font* pFont, CFX_FontCache* pCache, FX_FLOAT font_size, - const CFX_AffineMatrix* pText2Device, + const CFX_Matrix* pText2Device, FX_DWORD fill_color, FX_DWORD text_flags, int alpha_flag = 0, @@ -391,8 +391,8 @@ class CFX_RenderDevice { CFX_Font* pFont, CFX_FontCache* pCache, 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_DWORD fill_color, FX_DWORD stroke_color, @@ -495,17 +495,17 @@ class IFX_RenderDeviceDriver { virtual void RestoreState(FX_BOOL bKeepSaved = FALSE) = 0; virtual FX_BOOL SetClip_PathFill(const CFX_PathData* pPathData, - const CFX_AffineMatrix* pObject2Device, + const CFX_Matrix* pObject2Device, int fill_mode) = 0; virtual FX_BOOL SetClip_PathStroke(const CFX_PathData* pPathData, - const CFX_AffineMatrix* pObject2Device, + const CFX_Matrix* pObject2Device, const CFX_GraphStateData* pGraphState) { return FALSE; } virtual FX_BOOL DrawPath(const CFX_PathData* pPathData, - const CFX_AffineMatrix* pObject2Device, + const CFX_Matrix* pObject2Device, const CFX_GraphStateData* pGraphState, FX_DWORD fill_color, FX_DWORD stroke_color, @@ -576,7 +576,7 @@ class IFX_RenderDeviceDriver { virtual FX_BOOL StartDIBits(const CFX_DIBSource* pBitmap, int bitmap_alpha, FX_DWORD color, - const CFX_AffineMatrix* pMatrix, + const CFX_Matrix* pMatrix, FX_DWORD flags, void*& handle, int alpha_flag = 0, @@ -593,7 +593,7 @@ class IFX_RenderDeviceDriver { const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, CFX_FontCache* pCache, - const CFX_AffineMatrix* pObject2Device, + const CFX_Matrix* pObject2Device, FX_FLOAT font_size, FX_DWORD color, int alpha_flag = 0, @@ -637,17 +637,17 @@ class CFX_PSRenderer { void RestoreState(FX_BOOL bKeepSaved = FALSE); void SetClip_PathFill(const CFX_PathData* pPathData, - const CFX_AffineMatrix* pObject2Device, + const CFX_Matrix* pObject2Device, int fill_mode); void SetClip_PathStroke(const CFX_PathData* pPathData, - const CFX_AffineMatrix* pObject2Device, + const CFX_Matrix* pObject2Device, const CFX_GraphStateData* pGraphState); FX_RECT GetClipBox() { return m_ClipBox; } FX_BOOL DrawPath(const CFX_PathData* pPathData, - const CFX_AffineMatrix* pObject2Device, + const CFX_Matrix* pObject2Device, const CFX_GraphStateData* pGraphState, FX_DWORD fill_color, FX_DWORD stroke_color, @@ -674,7 +674,7 @@ class CFX_PSRenderer { FX_BOOL DrawDIBits(const CFX_DIBSource* pBitmap, FX_DWORD color, - const CFX_AffineMatrix* pMatrix, + const CFX_Matrix* pMatrix, FX_DWORD flags, int alpha_flag = 0, void* pIccTransform = NULL); @@ -683,7 +683,7 @@ class CFX_PSRenderer { const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, CFX_FontCache* pCache, - const CFX_AffineMatrix* pObject2Device, + const CFX_Matrix* pObject2Device, FX_FLOAT font_size, FX_DWORD color, int alpha_flag = 0, @@ -712,7 +712,7 @@ class CFX_PSRenderer { FX_BOOL m_bInited; void OutputPath(const CFX_PathData* pPathData, - const CFX_AffineMatrix* pObject2Device); + const CFX_Matrix* pObject2Device); void SetGraphState(const CFX_GraphStateData* pGraphState); -- cgit v1.2.3