Ignore:
Timestamp:
Aug 27, 2010, 11:00:52 AM (11 years ago)
Author:
Silvan Scherrer
Message:

poppler update to 0.14.2

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/poppler/mypoppler/poppler/Lexer.h

    r257 r461  
    1414// under GPL version 2 or later
    1515//
    16 // Copyright (C) 2006, 2007 Albert Astals Cid <aacid@kde.org>
     16// Copyright (C) 2006, 2007, 2010 Albert Astals Cid <aacid@kde.org>
    1717// Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
    1818//
     
    6565  // Get stream.
    6666  Stream *getStream()
    67     { return curStr.isNone() ? (Stream *)NULL : curStr.getStream(); }
     67    { return curStr.isStream() ? curStr.getStream() : (Stream *)NULL; }
    6868
    6969  // Get current position in file.  This is only used for error
    7070  // messages, so it returns an int instead of a Guint.
    7171  int getPos()
    72     { return curStr.isNone() ? -1 : (int)curStr.streamGetPos(); }
     72    { return curStr.isStream() ? (int)curStr.streamGetPos() : -1; }
    7373
    7474  // Set position in file.
    7575  void setPos(Guint pos, int dir = 0)
    76     { if (!curStr.isNone()) curStr.streamSetPos(pos, dir); }
     76    { if (curStr.isStream()) curStr.streamSetPos(pos, dir); }
    7777
    7878  // Returns true if <c> is a whitespace character.
Note: See TracChangeset for help on using the changeset viewer.