diff options
Diffstat (limited to 'Build/source/libs/poppler/poppler-src/poppler/Parser.h')
-rw-r--r-- | Build/source/libs/poppler/poppler-src/poppler/Parser.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Build/source/libs/poppler/poppler-src/poppler/Parser.h b/Build/source/libs/poppler/poppler-src/poppler/Parser.h index 1ce9445e19d..d27511080a7 100644 --- a/Build/source/libs/poppler/poppler-src/poppler/Parser.h +++ b/Build/source/libs/poppler/poppler-src/poppler/Parser.h @@ -13,7 +13,7 @@ // All changes made under the Poppler project to this file are licensed // under GPL version 2 or later // -// Copyright (C) 2006, 2010, 2013 Albert Astals Cid <aacid@kde.org> +// Copyright (C) 2006, 2010, 2013, 2017 Albert Astals Cid <aacid@kde.org> // Copyright (C) 2012 Hib Eris <hib@hiberis.nl> // Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com> // Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de> @@ -48,13 +48,14 @@ public: // Get the next object from the input stream. If <simpleOnly> is // true, do not parse compound objects (arrays, dictionaries, or // streams). - Object *getObj(Object *obj, GBool simpleOnly = gFalse, + Object getObj(GBool simpleOnly = gFalse, Guchar *fileKey = NULL, CryptAlgorithm encAlgorithm = cryptRC4, int keyLength = 0, int objNum = 0, int objGen = 0, int recursion = 0, GBool strict = gFalse); - Object *getObj(Object *obj, int recursion); + Object getObj(int recursion); + template<typename T> Object getObj(T) = delete; // Get stream. Stream *getStream() { return lexer->getStream(); } @@ -70,7 +71,7 @@ private: Object buf1, buf2; // next two tokens int inlineImg; // set when inline image data is encountered - Stream *makeStream(Object *dict, Guchar *fileKey, + Stream *makeStream(Object &&dict, Guchar *fileKey, CryptAlgorithm encAlgorithm, int keyLength, int objNum, int objGen, int recursion, GBool strict); |