| Index: core/src/fxge/agg/include/fx_agg_driver.h
|
| diff --git a/core/src/fxge/agg/include/fx_agg_driver.h b/core/src/fxge/agg/include/fx_agg_driver.h
|
| index 0e79a3fc5eb5fccf7b5a6dc135643581d472c954..80febe1b4efcf7dd420677b1ab243ac7761e67a4 100644
|
| --- a/core/src/fxge/agg/include/fx_agg_driver.h
|
| +++ b/core/src/fxge/agg/include/fx_agg_driver.h
|
| @@ -12,7 +12,7 @@
|
| #include "third_party/agg23/agg_path_storage.h"
|
| #include "third_party/agg23/agg_rasterizer_scanline_aa.h"
|
|
|
| -class CFX_AffineMatrix;
|
| +class CFX_Matrix;
|
| class CFX_PathData;
|
|
|
| class CAgg_PathData {
|
| @@ -21,7 +21,7 @@ class CAgg_PathData {
|
| ~CAgg_PathData() {}
|
| FX_NAMESPACE_DECLARE(agg, path_storage) m_PathData;
|
| void BuildPath(const CFX_PathData* pPathData,
|
| - const CFX_AffineMatrix* pObject2Device);
|
| + const CFX_Matrix* pObject2Device);
|
| };
|
| class CFX_AggDeviceDriver : public IFX_RenderDeviceDriver {
|
| public:
|
| @@ -40,13 +40,13 @@ class CFX_AggDeviceDriver : public IFX_RenderDeviceDriver {
|
| void SaveState() override;
|
| void RestoreState(FX_BOOL bKeepSaved) override;
|
| FX_BOOL SetClip_PathFill(const CFX_PathData* pPathData,
|
| - const CFX_AffineMatrix* pObject2Device,
|
| + const CFX_Matrix* pObject2Device,
|
| int fill_mode) override;
|
| FX_BOOL SetClip_PathStroke(const CFX_PathData* pPathData,
|
| - const CFX_AffineMatrix* pObject2Device,
|
| + const CFX_Matrix* pObject2Device,
|
| const CFX_GraphStateData* pGraphState) override;
|
| 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,
|
| @@ -103,7 +103,7 @@ class CFX_AggDeviceDriver : public IFX_RenderDeviceDriver {
|
| 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,
|
| @@ -115,7 +115,7 @@ class CFX_AggDeviceDriver : public 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,
|
|
|