r19669 by jghali - remove some preprocessor macro related to podofo : we already require podofo >= 0.7.0

[scribus-commit]

Author: jghali
Date: Thu Dec 18 22:57:35 2014
New Revision: 19669

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19669
Log:
remove some preprocessor macro related to podofo : we already require podofo >= 0.7.0

Modified:
    trunk/Scribus/scribus/plugins/import/ai/importai.cpp
    trunk/Scribus/scribus/scimgdataloader_pdf.cpp

Modified: trunk/Scribus/scribus/plugins/import/ai/importai.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19669&path=/trunk/Scribus/scribus/plugins/import/ai/importai.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ai/importai.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/ai/importai.cpp Thu Dec 18 22:57:35 2014
@@ -582,14 +582,8 @@
 	try
 	{
 		PoDoFo::PdfError::EnableDebug( false );
-#if (PODOFO_VERSION == 0 && PODOFO_MINOR > 6)
 		PoDoFo::PdfError::EnableLogging( false );
-#endif
-#if (PODOFO_VERSION == 0 && PODOFO_MINOR == 5 && PODOFO_REVISION == 99) || PODOFO_MINOR > 5
 		PoDoFo::PdfMemDocument doc( infile.toLocal8Bit().data() );
-#else
-		PoDoFo::PdfDocument doc( infile.toLocal8Bit().data() );
-#endif
 		PoDoFo::PdfPage *curPage = doc.GetPage(0);
 		if (curPage != NULL)
 		{

Modified: trunk/Scribus/scribus/scimgdataloader_pdf.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19669&path=/trunk/Scribus/scribus/scimgdataloader_pdf.cpp
==============================================================================
--- trunk/Scribus/scribus/scimgdataloader_pdf.cpp (original)
+++ trunk/Scribus/scribus/scimgdataloader_pdf.cpp Thu Dec 18 22:57:35 2014
@@ -56,14 +56,8 @@
 	try
 	{
 		PoDoFo::PdfError::EnableDebug( false );
-#if (PODOFO_VERSION == 0 && PODOFO_MINOR > 6)
 		PoDoFo::PdfError::EnableLogging( false );
-#endif
-#if (PODOFO_VERSION == 0 && PODOFO_MINOR == 5 && PODOFO_REVISION == 99) || PODOFO_MINOR > 5
 		PoDoFo::PdfMemDocument doc( fn.toLocal8Bit().data() );
-#else
-		PoDoFo::PdfDocument doc( fn.toLocal8Bit().data() );
-#endif
 		m_imageInfoRecord.numberOfPages = doc.GetPageCount();
 		if (page > m_imageInfoRecord.numberOfPages)
 		{