r19670 by jghali - fix incorrect podofo version checks

[scribus-commit]

Author: jghali
Date: Thu Dec 18 22:59:14 2014
New Revision: 19670

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19670
Log:
fix incorrect podofo version checks

Modified:
    branches/Version14x/Scribus/scribus/plugins/import/ai/importai.cpp
    branches/Version14x/Scribus/scribus/plugins/import/ps/importps.cpp
    branches/Version14x/Scribus/scribus/scimgdataloader_pdf.cpp

Modified: branches/Version14x/Scribus/scribus/plugins/import/ai/importai.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19670&path=/branches/Version14x/Scribus/scribus/plugins/import/ai/importai.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/plugins/import/ai/importai.cpp (original)
+++ branches/Version14x/Scribus/scribus/plugins/import/ai/importai.cpp Thu Dec 18 22:59:14 2014
@@ -368,10 +368,10 @@
 	try
 	{
 		PoDoFo::PdfError::EnableDebug( false );
-#if (PODOFO_VERSION == 0 && PODOFO_MINOR > 6)
+#if (PODOFO_VERSION >= PODOFO_MAKE_VERSION(0, 7, 0))
 		PoDoFo::PdfError::EnableLogging( false );
 #endif
-#if (PODOFO_VERSION == 0 && PODOFO_MINOR == 5 && PODOFO_REVISION == 99) || PODOFO_MINOR > 5
+#if (PODOFO_VERSION >= PODOFO_MAKE_VERSION(0, 5, 99))
 		PoDoFo::PdfMemDocument doc( infile.toLocal8Bit().data() );
 #else
 		PoDoFo::PdfDocument doc( infile.toLocal8Bit().data() );

Modified: branches/Version14x/Scribus/scribus/plugins/import/ps/importps.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19670&path=/branches/Version14x/Scribus/scribus/plugins/import/ps/importps.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/plugins/import/ps/importps.cpp (original)
+++ branches/Version14x/Scribus/scribus/plugins/import/ps/importps.cpp Thu Dec 18 22:59:14 2014
@@ -149,10 +149,10 @@
 		try
 		{
 			PoDoFo::PdfError::EnableDebug( false );
-#if (PODOFO_VERSION == 0 && PODOFO_MINOR > 6)
-		PoDoFo::PdfError::EnableLogging( false );
+#if (PODOFO_VERSION >= PODOFO_MAKE_VERSION(0, 7, 0))
+			PoDoFo::PdfError::EnableLogging( false );
 #endif
-#if (PODOFO_VERSION == 0 && PODOFO_MINOR == 5 && PODOFO_REVISION == 99) || PODOFO_MINOR > 5
+#if (PODOFO_VERSION >= PODOFO_MAKE_VERSION(0, 5, 99))
 			PoDoFo::PdfMemDocument doc( fName.toLocal8Bit().data() );
 #else
 			PoDoFo::PdfDocument doc( fName.toLocal8Bit().data() );

Modified: branches/Version14x/Scribus/scribus/scimgdataloader_pdf.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19670&path=/branches/Version14x/Scribus/scribus/scimgdataloader_pdf.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scimgdataloader_pdf.cpp (original)
+++ branches/Version14x/Scribus/scribus/scimgdataloader_pdf.cpp Thu Dec 18 22:59:14 2014
@@ -55,10 +55,10 @@
 	try
 	{
 		PoDoFo::PdfError::EnableDebug( false );
-#if (PODOFO_VERSION == 0 && PODOFO_MINOR > 6)
+#if (PODOFO_VERSION >= PODOFO_MAKE_VERSION(0, 7, 0))
 		PoDoFo::PdfError::EnableLogging( false );
 #endif
-#if (PODOFO_VERSION == 0 && PODOFO_MINOR == 5 && PODOFO_REVISION == 99) || PODOFO_MINOR > 5
+#if (PODOFO_VERSION >= PODOFO_MAKE_VERSION(0, 5, 99))
 		PoDoFo::PdfMemDocument doc( fn.toLocal8Bit().data() );
 #else
 		PoDoFo::PdfDocument doc( fn.toLocal8Bit().data() );