diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-12-10 15:34:55 -0800 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-12-10 15:34:55 -0800 |
commit | 60d909e9d4444b2b8582275624ee97734d331a38 (patch) | |
tree | 6a884e5dd0c785c141919531033de7e2fc5b0e01 /core/include/fxge/fx_dib.h | |
parent | 33c8c7602f8981c32d37a9b2e25496401e914391 (diff) | |
download | pdfium-60d909e9d4444b2b8582275624ee97734d331a38.tar.xz |
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 .
Diffstat (limited to 'core/include/fxge/fx_dib.h')
-rw-r--r-- | core/include/fxge/fx_dib.h | 12 |
1 files changed, 6 insertions, 6 deletions
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; |