Add support for poppler 0.30

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

config.h.cmake

@@ -1,6 +1,7 @@
 #cmakedefine VERSION "@VERSION@"
 
 // poppler-tqt
+#cmakedefine HAVE_POPPLER_030
 #cmakedefine HAVE_POPPLER_020
 #cmakedefine HAVE_POPPLER_016
 

tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake

@@ -17,5 +17,10 @@ check_cxx_source_compiles("
   #include <poppler/PSOutputDev.h>
   int main(int, char**) { int a; int b; PSOutputDev *psOut = new PSOutputDev(\"test\", (PDFDoc*)0, NULL, 0, 0, psModePS, a, b); } "
   HAVE_POPPLER_020 )
+check_cxx_source_compiles("
+  #include <vector>
+  #include <poppler/PSOutputDev.h>
+  int main(int, char**) { int a; int b; std::vector<int> p; PSOutputDev *psOut = new PSOutputDev(\"test\", (PDFDoc*)0, NULL, p, psModePS, a, b); } "
+  HAVE_POPPLER_030 )
 tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
 

tdefile-plugins/dependencies/poppler-tqt/poppler-document.cc

@@ -317,7 +317,14 @@ 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)
 {
-#if defined(HAVE_POPPLER_020)
+#if defined(HAVE_POPPLER_030)
+  std::vector<int> pages;
+  TQValueList<int>::iterator it;
+  for (it = pageList.begin();  it != pageList.end();  ++it ) {
+	pages.push_back(*it);
+  }
+  PSOutputDev *psOut = new PSOutputDev(file.latin1(), &(data->doc), NULL, pages, psModePS, paperWidth, paperHeight);
+#elif 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);

tdefile-plugins/dependencies/poppler-tqt/poppler-page.cc

@@ -129,7 +129,7 @@ TQString Page::getText(const Rectangle &r) const
   TQString result;
   ::Page *p;
 
-#if defined(HAVE_POPPLER_020)
+#if defined(HAVE_POPPLER_030) || defined(HAVE_POPPLER_020)
   output_dev = new TextOutputDev(0, gFalse, 0, gFalse, gFalse);
 #else
   output_dev = new TextOutputDev(0, gFalse, gFalse, gFalse);
@@ -164,7 +164,7 @@ TQValueList<TextBox*> Page::textList() const
 
   TQValueList<TextBox*> output_list;
 
-#if defined(HAVE_POPPLER_020)
+#if defined(HAVE_POPPLER_030) || defined(HAVE_POPPLER_020)
   output_dev = new TextOutputDev(0, gFalse, 0, gFalse, gFalse);
 #else
   output_dev = new TextOutputDev(0, gFalse, gFalse, gFalse);