summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-06-25 16:17:49 -0500
committerSlávek Banko <slavek.banko@axis.cz>2012-07-05 02:46:07 +0200
commit5a7bcea79fbbc32da710a2a1537bee748723c7a9 (patch)
tree98b232f888494a9fcbf5bf968613c785c5f3f871
parent8addb8e4d0adb8f90430dca0af115fe75b8e29d8 (diff)
downloadtdegraphics-5a7bcea79fbbc32da710a2a1537bee748723c7a9.tar.gz
tdegraphics-5a7bcea79fbbc32da710a2a1537bee748723c7a9.zip
Fix FTBFS on older poppler versions
(cherry picked from commit 30b1d13fab1ee5214fd838db8417930bd76bc24b)
-rw-r--r--kfile-plugins/dependencies/poppler-tqt/poppler-document.cc4
-rw-r--r--kfile-plugins/dependencies/poppler-tqt/poppler-page.cc34
2 files changed, 19 insertions, 19 deletions
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-document.cc b/kfile-plugins/dependencies/poppler-tqt/poppler-document.cc
index 0856d83f..2e7cc516 100644
--- a/kfile-plugins/dependencies/poppler-tqt/poppler-document.cc
+++ b/kfile-plugins/dependencies/poppler-tqt/poppler-document.cc
@@ -317,9 +317,9 @@ 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_020
+#if defined(HAVE_POPPLER_020)
PSOutputDev *psOut = new PSOutputDev(file.latin1(), &(data->doc), NULL, 1, data->doc.getNumPages(), psModePS, paperWidth, paperHeight);
-#elif HAVE_POPPLER_016
+#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);
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-page.cc b/kfile-plugins/dependencies/poppler-tqt/poppler-page.cc
index c5be6ddf..3d1e6569 100644
--- a/kfile-plugins/dependencies/poppler-tqt/poppler-page.cc
+++ b/kfile-plugins/dependencies/poppler-tqt/poppler-page.cc
@@ -88,7 +88,7 @@ TQImage Page::renderToImage(double xres, double yres, bool doLinks) const
int bw = output_dev->getBitmap()->getWidth();
int bh = output_dev->getBitmap()->getHeight();
SplashColorPtr dataPtr = output_dev->getBitmap()->getDataPtr();
-
+
if (TQImage::BigEndian == TQImage::systemByteOrder())
{
uchar c;
@@ -104,7 +104,7 @@ TQImage Page::renderToImage(double xres, double yres, bool doLinks) const
dataPtr[k+2] = c;
}
}
-
+
// construct a qimage SHARING the raw bitmap data in memory
TQImage img( dataPtr, bw, bh, 32, 0, 0, TQImage::IgnoreEndian );
img = img.copy();
@@ -129,7 +129,7 @@ TQString Page::getText(const Rectangle &r) const
TQString result;
::Page *p;
-#ifdef HAVE_POPPLER_020
+#if defined(HAVE_POPPLER_020)
output_dev = new TextOutputDev(0, gFalse, 0, gFalse, gFalse);
#else
output_dev = new TextOutputDev(0, gFalse, gFalse, gFalse);
@@ -161,10 +161,10 @@ TQString Page::getText(const Rectangle &r) const
TQValueList<TextBox*> Page::textList() const
{
TextOutputDev *output_dev;
-
+
TQValueList<TextBox*> output_list;
-#ifdef HAVE_POPPLER_020
+#if defined(HAVE_POPPLER_020)
output_dev = new TextOutputDev(0, gFalse, 0, gFalse, gFalse);
#else
output_dev = new TextOutputDev(0, gFalse, gFalse, gFalse);
@@ -174,12 +174,12 @@ TQValueList<TextBox*> Page::textList() const
0, false, false, false, -1, -1, -1, -1);
TextWordList *word_list = output_dev->makeWordList();
-
+
if (!word_list) {
delete output_dev;
return output_list;
}
-
+
for (int i = 0; i < word_list->getLength(); i++) {
TextWord *word = word_list->get(i);
GooString *word_str = word->getText();
@@ -187,21 +187,21 @@ TQValueList<TextBox*> Page::textList() const
delete word_str;
double xMin, yMin, xMax, yMax;
word->getBBox(&xMin, &yMin, &xMax, &yMax);
-
+
TextBox* text_box = new TextBox(string, Rectangle(xMin, yMin, xMax, yMax));
-
+
output_list.append(text_box);
}
-
+
delete word_list;
delete output_dev;
-
+
return output_list;
}
PageTransition *Page::getTransition() const
{
- if (!data->transition)
+ if (!data->transition)
{
Object o;
PageTransitionParams params;
@@ -253,12 +253,12 @@ TQValueList<Link*> Page::links() const
for (int i = 0; i < xpdfLinks->getNumLinks(); ++i)
{
::Link *xpdfLink = xpdfLinks->getLink(i);
-
+
double left, top, right, bottom;
int leftAux, topAux, rightAux, bottomAux;
xpdfLink->getRect( &left, &top, &right, &bottom );
TQRect linkArea;
-
+
data->doc->data->m_outputDev->cvtUserToDev( left, top, &leftAux, &topAux );
data->doc->data->m_outputDev->cvtUserToDev( right, bottom, &rightAux, &bottomAux );
linkArea.setLeft(leftAux);
@@ -325,7 +325,7 @@ TQValueList<Link*> Page::links() const
popplerLink = new LinkAction( linkArea, LinkAction::Presentation );
else if ( !strcmp( name, "Close" ) )
{
- // acroread closes the document always, doesnt care whether
+ // acroread closes the document always, doesnt care whether
// its presentation mode or not
// popplerLink = new LinkAction( linkArea, LinkAction::EndPresentation );
popplerLink = new LinkAction( linkArea, LinkAction::Close );
@@ -354,7 +354,7 @@ TQValueList<Link*> Page::links() const
break;
}
}
-
+
if (popplerLink)
{
popplerLinks.append(popplerLink);
@@ -363,7 +363,7 @@ TQValueList<Link*> Page::links() const
delete xpdfLinks;
#endif
-
+
return popplerLinks;
}