diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-01-26 13:34:19 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-01-26 13:34:19 -0800 |
| commit | bef1eb99263b80d013d9a2c2618446dec99551c1 (patch) | |
| tree | 360d9c421e94cc1c17ccf8f2c8201ee4068cbb5a /core/src/fpdfapi/fpdf_page/pageint.h | |
| parent | 8e5cd19d174f259bfda5f7a9699b08fdc4289b56 (diff) | |
| download | pdfium-bef1eb99263b80d013d9a2c2618446dec99551c1.tar.xz | |
Merge to XFA: Move struct ContentParam off of CPDF_Object's enums
Original Review URL: https://codereview.chromium.org/1635173003 .
(cherry picked from commit 0ec8bb4486ab315283f36d071be2ddc1b80998c3)
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1636133002 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_page/pageint.h')
| -rw-r--r-- | core/src/fpdfapi/fpdf_page/pageint.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/src/fpdfapi/fpdf_page/pageint.h b/core/src/fpdfapi/fpdf_page/pageint.h index 3d33387e2d..9c8946b721 100644 --- a/core/src/fpdfapi/fpdf_page/pageint.h +++ b/core/src/fpdfapi/fpdf_page/pageint.h @@ -68,7 +68,8 @@ class CPDF_StreamParser { #define PARAM_BUF_SIZE 16 struct ContentParam { - int m_Type; + enum Type { OBJECT = 0, NUMBER, NAME }; + Type m_Type; union { struct { FX_BOOL m_bInteger; @@ -240,7 +241,7 @@ class CPDF_StreamContentParser { CFX_Matrix m_mtContentToUser; CFX_FloatRect m_BBox; CPDF_ParseOptions m_Options; - ContentParam m_ParamBuf1[PARAM_BUF_SIZE]; + ContentParam m_ParamBuf[PARAM_BUF_SIZE]; FX_DWORD m_ParamStartPos; FX_DWORD m_ParamCount; CPDF_StreamParser* m_pSyntax; |