diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-01-25 13:37:42 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-01-25 13:37:42 -0800 |
| commit | 0f68785be6af2b15109bb8a8f3bb7ebc040500d5 (patch) | |
| tree | 3e76a6b83d0bebb44f3a37c4599838a179fc68c2 /core/include | |
| parent | 02056fae83c8136195c8eb2a00c3606f600a8b6a (diff) | |
| download | pdfium-0f68785be6af2b15109bb8a8f3bb7ebc040500d5.tar.xz | |
Remove struct PARSE_OPTIONS.
Its members are assigned to, but never used in any calculations
(besides for other members).
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1630973002 .
Diffstat (limited to 'core/include')
| -rw-r--r-- | core/include/fpdfapi/fpdf_objects.h | 3 | ||||
| -rw-r--r-- | core/include/fpdfapi/fpdf_parser.h | 20 |
2 files changed, 5 insertions, 18 deletions
diff --git a/core/include/fpdfapi/fpdf_objects.h b/core/include/fpdfapi/fpdf_objects.h index 83b39e2986..d0617e01ab 100644 --- a/core/include/fpdfapi/fpdf_objects.h +++ b/core/include/fpdfapi/fpdf_objects.h @@ -29,7 +29,6 @@ class CPDF_StreamAcc; class CPDF_StreamFilter; class CPDF_String; class IFX_FileRead; -struct PARSE_CONTEXT; #define PDFOBJ_INVALID 0 #define PDFOBJ_BOOLEAN 1 @@ -567,7 +566,7 @@ class CPDF_IndirectObjectHolder { explicit CPDF_IndirectObjectHolder(CPDF_Parser* pParser); ~CPDF_IndirectObjectHolder(); - CPDF_Object* GetIndirectObject(FX_DWORD objnum, PARSE_CONTEXT* pContext); + CPDF_Object* GetIndirectObject(FX_DWORD objnum); FX_DWORD AddIndirectObject(CPDF_Object* pObj); void ReleaseIndirectObject(FX_DWORD objnum); diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h index 8b4472eb5d..a12a867062 100644 --- a/core/include/fpdfapi/fpdf_parser.h +++ b/core/include/fpdfapi/fpdf_parser.h @@ -261,13 +261,11 @@ class CPDF_SyntaxParser { CPDF_Object* GetObject(CPDF_IndirectObjectHolder* pObjList, FX_DWORD objnum, FX_DWORD gennum, - PARSE_CONTEXT* pContext, FX_BOOL bDecrypt); CPDF_Object* GetObjectByStrict(CPDF_IndirectObjectHolder* pObjList, FX_DWORD objnum, - FX_DWORD gennum, - PARSE_CONTEXT* pContext); + FX_DWORD gennum); int GetDirectNum(); @@ -332,7 +330,6 @@ class CPDF_SyntaxParser { unsigned int ReadEOLMarkers(FX_FILESIZE pos); CPDF_Stream* ReadStream(CPDF_Dictionary* pDict, - PARSE_CONTEXT* pContext, FX_DWORD objnum, FX_DWORD gennum); @@ -363,13 +360,6 @@ class CPDF_SyntaxParser { FX_FILESIZE m_dwWordPos; }; -struct PARSE_CONTEXT { - FX_FILESIZE m_DictStart; - FX_FILESIZE m_DictEnd; - FX_FILESIZE m_DataStart; - FX_FILESIZE m_DataEnd; -}; - #define PDFPARSE_ERROR_SUCCESS 0 #define PDFPARSE_ERROR_FILE 1 #define PDFPARSE_ERROR_FORMAT 2 @@ -416,8 +406,8 @@ class CPDF_Parser { CPDF_Dictionary* GetEncryptDict() { return m_pEncryptDict; } CPDF_Object* ParseIndirectObject(CPDF_IndirectObjectHolder* pObjList, - FX_DWORD objnum, - PARSE_CONTEXT* pContext = NULL); + FX_DWORD objnum); + FX_DWORD GetLastObjNum() const; bool IsValidObjectNumber(FX_DWORD objnum) const; FX_BOOL IsFormStream(FX_DWORD objnum, FX_BOOL& bForm); @@ -435,14 +425,12 @@ class CPDF_Parser { FX_BOOL IsXRefStream() const { return m_bXRefStream; } CPDF_Object* ParseIndirectObjectAt(CPDF_IndirectObjectHolder* pObjList, FX_FILESIZE pos, - FX_DWORD objnum, - PARSE_CONTEXT* pContext); + FX_DWORD objnum); CPDF_Object* ParseIndirectObjectAtByStrict( CPDF_IndirectObjectHolder* pObjList, FX_FILESIZE pos, FX_DWORD objnum, - PARSE_CONTEXT* pContext, FX_FILESIZE* pResultPos); FX_DWORD StartAsynParse(IFX_FileRead* pFile, |