| Index: core/include/fpdfapi/fpdf_parser.h
|
| diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h
|
| index 8b4472eb5dc3a69ffbb0fb5a532a721e7bd26b75..a12a86706281876f627f5dc73743d3d5b62cb8ba 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,
|
|
|