diff options
author | Darrell Anderson <[email protected]> | 2012-06-27 16:15:21 -0500 |
---|---|---|
committer | Darrell Anderson <[email protected]> | 2012-06-27 16:15:21 -0500 |
commit | 28e289a5e12fe273464a16f03daeb5d799c67db2 (patch) | |
tree | 55f7f5cca57d3754d345bfeb19e7234a578fcf77 /kfile-plugins/dependencies/poppler-tqt/poppler-document.cc | |
parent | 80cd15ea98ce16b3dcfd0a57b8b7a6ac94fa0666 (diff) | |
parent | 30b1d13fab1ee5214fd838db8417930bd76bc24b (diff) | |
download | tdegraphics-28e289a5e12fe273464a16f03daeb5d799c67db2.tar.gz tdegraphics-28e289a5e12fe273464a16f03daeb5d799c67db2.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdegraphics
Diffstat (limited to 'kfile-plugins/dependencies/poppler-tqt/poppler-document.cc')
-rw-r--r-- | kfile-plugins/dependencies/poppler-tqt/poppler-document.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-document.cc b/kfile-plugins/dependencies/poppler-tqt/poppler-document.cc index a13fd99a..2e7cc516 100644 --- a/kfile-plugins/dependencies/poppler-tqt/poppler-document.cc +++ b/kfile-plugins/dependencies/poppler-tqt/poppler-document.cc @@ -317,17 +317,19 @@ bool Document::print(const TQString &fileName, TQValueList<int> pageList, double bool Document::print(const TQString &file, TQValueList<int> pageList, double hDPI, double vDPI, int rotate, int paperWidth, int paperHeight) { -#ifdef HAVE_POPPLER_016 +#if defined(HAVE_POPPLER_020) + PSOutputDev *psOut = new PSOutputDev(file.latin1(), &(data->doc), NULL, 1, data->doc.getNumPages(), psModePS, paperWidth, paperHeight); +#elif defined(HAVE_POPPLER_016) PSOutputDev *psOut = new PSOutputDev(file.latin1(), &(data->doc), data->doc.getXRef(), data->doc.getCatalog(), NULL, 1, data->doc.getNumPages(), psModePS, paperWidth, paperHeight); #else PSOutputDev *psOut = new PSOutputDev(file.latin1(), data->doc.getXRef(), data->doc.getCatalog(), NULL, 1, data->doc.getNumPages(), psModePS, paperWidth, paperHeight); #endif - + if (psOut->isOk()) { TQValueList<int>::iterator it; for (it = pageList.begin(); it != pageList.end(); ++it ) data->doc.displayPage(psOut, *it, hDPI, vDPI, rotate, gFalse, gTrue, gTrue); - + delete psOut; return true; } else { |