← Back to branch summary

~ubuntu-branches/ubuntu/lucid/xpdf/lucid-updates

« back to all changes in this revision

Viewing changes to xpdf/ImageOutputDev.cc

  • Committer: Bazaar Package Importer
  • Author(s): Andy Price
  • Date: 2007-05-17 22:04:33 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20070517220433-gzcx2lrvllkbl7mr
Tags: 3.02-1ubuntu1
https://launchpad.net/bugs/113365
* Merge from Debian unstable (LP: #113365), remaining changes:
  - Added back 09_xpdfrc_manpage.dpatch (LP #71753)
  - Set Ubuntu maintainer

Show diffs side-by-side

added added

removed removed

Lines of Context:
xpdf/ImageOutputDev.cc
107
107
 
108
108
  // dump JPEG file
109
109
  if (dumpJPEG && str->getKind() == strDCT &&
110
 
      colorMap->getNumPixelComps() == 3 &&
 
110
      (colorMap->getNumPixelComps() == 1 ||
 
111
       colorMap->getNumPixelComps() == 3) &&
111
112
      !inlineImg) {
112
113
 
113
114
    // open the image file