poppler/Lexer.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
New commits: commit b15c793a8a58b17a7fe7b32c1037726e1e0e1bf0 Author: Albert Astals Cid <[email protected]> Date: Tue Jun 1 20:57:16 2010 +0100 Check it is a stream, not that it is not none People is reporting aborts, e.g. KDE bug 240208 but can not check if this really fixes it since he can not share the document diff --git a/poppler/Lexer.h b/poppler/Lexer.h index a0fcc6a..284479d 100644 --- a/poppler/Lexer.h +++ b/poppler/Lexer.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, 2007 Albert Astals Cid <[email protected]> +// Copyright (C) 2006, 2007, 2010 Albert Astals Cid <[email protected]> // Copyright (C) 2006 Krzysztof Kowalczyk <[email protected]> // // To see a description of the changes please see the Changelog file that @@ -64,16 +64,16 @@ public: // Get stream. Stream *getStream() - { return curStr.isNone() ? (Stream *)NULL : curStr.getStream(); } + { return curStr.isStream() ? curStr.getStream() : (Stream *)NULL; } // Get current position in file. This is only used for error // messages, so it returns an int instead of a Guint. int getPos() - { return curStr.isNone() ? -1 : (int)curStr.streamGetPos(); } + { return curStr.isStream() ? (int)curStr.streamGetPos() : -1; } // Set position in file. void setPos(Guint pos, int dir = 0) - { if (!curStr.isNone()) curStr.streamSetPos(pos, dir); } + { if (curStr.isStream()) curStr.streamSetPos(pos, dir); } // Returns true if <c> is a whitespace character. static GBool isSpace(int c); _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
