[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/trinity/kdegraphics
From:       Timothy Pearson <kb9vqf () pearsoncomputing ! net>
Date:       2011-07-31 19:57:26
Message-ID: 20110731195726.4D194AC86C () svn ! kde ! org
[Download RAW message or body]

SVN commit 1244223 by tpearson:

Fix kdegraphics poppler >=0.16 detection


 M  +3 -0      config.h.cmake  
 M  +0 -4      kfile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake  
 M  +2 -1      kfile-plugins/dependencies/poppler-tqt/poppler-document.cc  


--- branches/trinity/kdegraphics/config.h.cmake #1244222:1244223
@@ -1,5 +1,8 @@
 #cmakedefine VERSION "@VERSION@"
 
+// poppler-tqt
+#cmakedefine HAVE_POPPLER_016
+
 // kpdf, kdvi
 #cmakedefine HAVE_FREETYPE 1
 
--- branches/trinity/kdegraphics/kfile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake \
#1244222:1244223 @@ -6,7 +6,3 @@
   int main(int, char**) { int a; int b; PSOutputDev *psOut = new \
PSOutputDev(\"test\", (PDFDoc*)0, (XRef*)0, (Catalog*)0, NULL, 0, 0, psModePS, a, b); \
} "  HAVE_POPPLER_016 )
 tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
-
-if( HAVE_POPPLER_016 )
-    set( POPPLER_016 1 )
-endif( )
--- branches/trinity/kdegraphics/kfile-plugins/dependencies/poppler-tqt/poppler-document.cc \
#1244222:1244223 @@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+#include <config.h>
 #include <poppler-qt.h>
 #include <tqfile.h>
 #include <GlobalParams.h>
@@ -316,7 +317,7 @@
 
 bool Document::print(const TQString &file, TQValueList<int> pageList, double hDPI, \
double vDPI, int rotate, int paperWidth, int paperHeight)  {
-#ifdef POPPLER_016
+#ifdef 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);


[prev in list] [next in list] [prev in thread] [next in thread]