← Back to branch summary

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

« back to all changes in this revision

Viewing changes to poppler/PreScanOutputDev.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:
poppler/PreScanOutputDev.cc
15
15
//
16
16
// Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
17
17
// Copyright (C) 2010 Albert Astals Cid <aacid@kde.org>
 
18
// Copyright (C) 2011 William Bader <williambader@hotmail.com>
18
19
//
19
20
// To see a description of the changes please see the Changelog file that
20
21
// came with your tarball or type make ChangeLog if you are building from git
36
37
//------------------------------------------------------------------------
37
38
 
38
39
PreScanOutputDev::PreScanOutputDev() {
 
40
  level = globalParams->getPSLevel();
39
41
  clearStats();
40
42
}
41
43
 
141
143
  check(state->getFillColorSpace(), state->getFillColor(),
142
144
        state->getFillOpacity(), state->getBlendMode());
143
145
  gdi = gFalse;
 
146
  if ((level == psLevel1 || level == psLevel1Sep) &&
 
147
      state->getFillColorSpace()->getMode() == csPattern) {
 
148
    level1PSBug = gTrue;
 
149
  }
144
150
 
145
151
  if (inlineImg) {
146
152
    str->reset();
281
287
  gray = gTrue;
282
288
  transparency = gFalse;
283
289
  gdi = gTrue;
 
290
  level1PSBug = gFalse;
284
291
}