~ubuntu-branches/ubuntu/precise/poppler/precise-security

« back to all changes in this revision

Viewing changes to poppler/JBIG2Stream.cc

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2011-03-08 10:46:40 UTC
  • mfrom: (1.5.5) (4.3.2 experimental)
  • Revision ID: package-import@ubuntu.com-20110308104640-de1rwygu2cx2t0yt
Tags: 0.16.3-1ubuntu1
* Merge with Debian experimental. Remaining Ubuntu changes:
  - debian/control: Lower poppler-data to Suggests: (handled by
    language-selector).
  - Add 10_fix-a4-page-shift-on-brother-ps-printers.patch: Fix page shifts
    when printing on A4 paper with Brother PostScript printers.
    (LP #293832)
  - debian/control, debian/rules: Disable OpenJPEG, it's in universe.

Show diffs side-by-side

added added

removed removed

Lines of Context:
17
17
// Copyright (C) 2006 Paul Walmsley <paul@booyaka.com>
18
18
// Copyright (C) 2006-2010 Albert Astals Cid <aacid@kde.org>
19
19
// Copyright (C) 2009 David Benjamin <davidben@mit.edu>
 
20
// Copyright (C) 2011 Edward Jiang <ejiang@google.com>
20
21
//
21
22
// To see a description of the changes please see the Changelog file that
22
23
// came with your tarball or type make ChangeLog if you are building from git
2288
2289
    s = sFirst;
2289
2290
 
2290
2291
    // read the instances
2291
 
    while (1) {
 
2292
    while (inst < numInstances) {
2292
2293
 
2293
2294
      // T value
2294
2295
      if (strips == 1) {