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/fpdfapi/fpdf_parser.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/fpdfapi/fpdf_parser.h')
| -rw-r--r-- | core/include/fpdfapi/fpdf_parser.h | 5 |
1 files changed, 2 insertions, 3 deletions
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); |