← Back to branch summary

~ubuntu-branches/ubuntu/dapper/poppler/dapper-security

« back to all changes in this revision

Viewing changes to poppler/Parser.cc

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2006-03-06 18:42:44 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20060306184244-oomqyiqr7cgncp2c
Tags: 0.5.1-0ubuntu1
* New upstream version:
  - Support for embedded files.
  - Handle 0-width lines correctly.
  - Avoid external file use when opening fonts.
  - Only use vector fonts returned from fontconfig (#5758).
  - Fix scaled 1x1 pixmaps use for drawing lines (#3387).
  - drawSoftMaskedImage support in cairo backend.
  - Misc bug fixes: #5922, #5946, #5749, #5952, #4030, #5420.
* debian/control.in, debian/libpoppler0c2.dirs, 
  debian/libpoppler0c2-glib.dirs, debian/libpoppler0c2-glib.install,
  debian/libpoppler0c2.install, debian/libpoppler0c2-qt.dirs,
  debian/libpoppler0c2-qt.install, debian/rules:
  - updated for the soname change
* debian/patches/000_splash_build_fix.patch:
  - fix build when using splash
* debian/patches/001_fixes_for_fonts_selection.patch:
  - fix with the new version

Show diffs side-by-side

added added

removed removed

Lines of Context:
poppler/Parser.cc
20
20
#include "XRef.h"
21
21
#include "Error.h"
22
22
#include "Decrypt.h"
 
23
#include "UGooString.h"
23
24
 
24
25
Parser::Parser(XRef *xrefA, Lexer *lexerA) {
25
26
  xref = xrefA;
68
69
 
69
70
  // dictionary or stream
70
71
  } else if (buf1.isCmd("<<")) {
71
 
    shift();
 
72
    shift(objNum);
72
73
    obj->initDict(xref);
73
74
    while (!buf1.isCmd(">>") && !buf1.isEOF()) {
74
75
      if (!buf1.isName()) {
82
83
          break;
83
84
        }
84
85
        obj->dictAdd(key, getObj(&obj2, fileKey, keyLength, objNum, objGen));
 
86
        gfree(key);
85
87
      }
86
88
    }
87
89
    if (buf1.isEOF())
192
194
  return str;
193
195
}
194
196
 
195
 
void Parser::shift() {
 
197
void Parser::shift(int objNum) {
196
198
  if (inlineImg > 0) {
197
199
    if (inlineImg < 2) {
198
200
      ++inlineImg;
210
212
  if (inlineImg > 0)            // don't buffer inline image data
211
213
    buf2.initNull();
212
214
  else
213
 
    lexer->getObj(&buf2);
 
215
    lexer->getObj(&buf2, objNum);
214
216
}