core/src/fxge/win32/win32_int.h - Issue 1519693002: Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

Unified Diff: core/src/fxge/win32/win32_int.h

Issue 1519693002: Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa

Patch Set: XFA-specific changes Created 5 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: core/src/fxge/win32/win32_int.h

diff --git a/core/src/fxge/win32/win32_int.h b/core/src/fxge/win32/win32_int.h

index 95d31d159d755fcdef99b76e87507f33fb0c32eb..061647667658a743def69f745df06caf8b15a1a9 100644

--- a/core/src/fxge/win32/win32_int.h

+++ b/core/src/fxge/win32/win32_int.h

@@ -36,7 +36,7 @@ class CGdiplusExt {

int flags);

FX_BOOL DrawPath(HDC hDC,

const CFX_PathData* pPathData,

- const CFX_AffineMatrix* pObject2Device,

+ const CFX_Matrix* pObject2Device,

const CFX_GraphStateData* pGraphState,

FX_DWORD fill_argb,

FX_DWORD stroke_argb,

@@ -117,13 +117,13 @@ class CGdiDeviceDriver : public IFX_RenderDeviceDriver {

}

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,

@@ -212,7 +212,7 @@ class CGdiDisplayDriver : public CGdiDeviceDriver {

virtual FX_BOOL StartDIBits(const CFX_DIBSource* pBitmap,

int bitmap_alpha,

FX_DWORD color,

- const CFX_AffineMatrix* pMatrix,

+ const CFX_Matrix* pMatrix,

FX_DWORD render_flags,

void*& handle,

int alpha_flag,

@@ -260,7 +260,7 @@ class CGdiPrinterDriver : public CGdiDeviceDriver {

virtual FX_BOOL StartDIBits(const CFX_DIBSource* pBitmap,

int bitmap_alpha,

FX_DWORD color,

- const CFX_AffineMatrix* pMatrix,

+ const CFX_Matrix* pMatrix,

FX_DWORD render_flags,

void*& handle,

int alpha_flag,

@@ -300,13 +300,13 @@ class CPSPrinterDriver : public IFX_RenderDeviceDriver {

void SaveState() override;

void RestoreState(FX_BOOL bKeepSaved = FALSE) 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,

@@ -337,7 +337,7 @@ class CPSPrinterDriver : 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 render_flags,

void*& handle,

int alpha_flag,

@@ -347,7 +347,7 @@ class CPSPrinterDriver : 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,

« no previous file with comments | « core/src/fxge/win32/fx_win32_print.cpp ('k') | fpdfsdk/include/formfiller/FFL_FormFiller.h » ('j') | xfa/src/fdp/src/fde/fde_gedevice.cpp » ('J')