summaryrefslogtreecommitdiff
path: root/core/include
diff options
context:
space:
mode:
Diffstat (limited to 'core/include')
-rw-r--r--core/include/fpdfapi/fpdf_parser.h15
-rw-r--r--core/include/fxcrt/fx_system.h1
2 files changed, 5 insertions, 11 deletions
diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h
index c57d9f20b9..5903e82a16 100644
--- a/core/include/fpdfapi/fpdf_parser.h
+++ b/core/include/fpdfapi/fpdf_parser.h
@@ -239,43 +239,33 @@ class CPDF_SyntaxParser {
void InitParser(IFX_FileRead* pFileAccess, FX_DWORD HeaderOffset);
FX_FILESIZE SavePos() const { return m_Pos; }
-
void RestorePos(FX_FILESIZE pos) { m_Pos = pos; }
CPDF_Object* GetObject(CPDF_IndirectObjectHolder* pObjList,
FX_DWORD objnum,
FX_DWORD gennum,
FX_BOOL bDecrypt);
-
CPDF_Object* GetObjectByStrict(CPDF_IndirectObjectHolder* pObjList,
FX_DWORD objnum,
FX_DWORD gennum);
-
- int GetDirectNum();
-
CFX_ByteString GetKeyword();
void ToNextLine();
-
void ToNextWord();
FX_BOOL SearchWord(const CFX_ByteStringC& word,
FX_BOOL bWholeWord,
FX_BOOL bForward,
FX_FILESIZE limit);
-
int SearchMultiWord(const CFX_ByteStringC& words,
FX_BOOL bWholeWord,
FX_FILESIZE limit);
-
FX_FILESIZE FindTag(const CFX_ByteStringC& tag, FX_FILESIZE limit);
void SetEncrypt(std::unique_ptr<CPDF_CryptoHandler> pCryptoHandler);
- FX_BOOL GetCharAt(FX_FILESIZE pos, uint8_t& ch);
-
FX_BOOL ReadBlock(uint8_t* pBuf, FX_DWORD size);
-
+ FX_BOOL GetCharAt(FX_FILESIZE pos, uint8_t& ch);
CFX_ByteString GetNextWord(bool* bIsNumber);
protected:
@@ -318,6 +308,9 @@ class CPDF_SyntaxParser {
std::unique_ptr<CPDF_CryptoHandler> m_pCryptoHandler;
uint8_t m_WordBuffer[257];
FX_DWORD m_WordSize;
+
+ private:
+ uint32_t GetDirectNum();
};
class CPDF_Parser {
diff --git a/core/include/fxcrt/fx_system.h b/core/include/fxcrt/fx_system.h
index e28099ed4a..462fb3babf 100644
--- a/core/include/fxcrt/fx_system.h
+++ b/core/include/fxcrt/fx_system.h
@@ -264,6 +264,7 @@ wchar_t* FXSYS_wcsupr(wchar_t* str);
#define FXSYS_HIWORD(dword) ((FX_WORD)((dword) >> 16))
#define FXSYS_LOWORD(dword) ((FX_WORD)(dword))
int32_t FXSYS_atoi(const FX_CHAR* str);
+uint32_t FXSYS_atoui(const FX_CHAR* str);
int32_t FXSYS_wtoi(const FX_WCHAR* str);
int64_t FXSYS_atoi64(const FX_CHAR* str);
int64_t FXSYS_wtoi64(const FX_WCHAR* str);