From a66b07f4106c1508cdd9018e5608a69b5331491b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fauconnier?= <fc86@outlook.fr>
Date: Thu, 7 May 2020 15:22:59 +0200
Subject: [PATCH] rollback to xpdf on Windows (used USE_XPDF define, thanks to
 @ootwch PR)

---
 src/pdf/XPDFRenderer.cpp | 13 +++++++++++--
 src/pdf/XPDFRenderer.h   | 19 +++++++++++++------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/pdf/XPDFRenderer.cpp b/src/pdf/XPDFRenderer.cpp
index a77ee49f..f7769f4b 100644
--- a/src/pdf/XPDFRenderer.cpp
+++ b/src/pdf/XPDFRenderer.cpp
@@ -32,7 +32,9 @@
 #include <QtGui>
 
 #include <frameworks/UBPlatformUtils.h>
-#include <poppler/cpp/poppler-version.h>
+#ifndef USE_XPDF
+    #include <poppler/cpp/poppler-version.h>
+#endif
 
 #include "core/memcheck.h"
 
@@ -55,8 +57,11 @@ XPDFRenderer::XPDFRenderer(const QString &filename, bool importingFile)
 #endif
         globalParams->setupBaseFonts(QFile::encodeName(UBPlatformUtils::applicationResourcesDirectory() + "/" + "fonts").data());
     }
-
+#ifdef USE_XPDF
+    mDocument = new PDFDoc(new GString(filename.toLocal8Bit()), 0, 0, 0); // the filename GString is deleted on PDFDoc desctruction
+#else
     mDocument = new PDFDoc(new GooString(filename.toLocal8Bit()), 0, 0, 0); // the filename GString is deleted on PDFDoc desctruction
+#endif
     sInstancesCount.ref();
 }
 
@@ -194,7 +199,11 @@ QImage* XPDFRenderer::createPDFImage(int pageNumber, qreal xscale, qreal yscale,
         if(mSplash)
             delete mSplash;
         mSplash = new SplashOutputDev(splashModeRGB8, 1, false, paperColor);
+#ifdef USE_XPDF
+        mSplash->startDoc(mDocument->getXRef());
+#else
         mSplash->startDoc(mDocument);
+#endif
         int rotation = 0; // in degrees (get it from the worldTransform if we want to support rotation)
         bool useMediaBox = false;
         bool crop = true;
diff --git a/src/pdf/XPDFRenderer.h b/src/pdf/XPDFRenderer.h
index 003a2055..c542fac0 100644
--- a/src/pdf/XPDFRenderer.h
+++ b/src/pdf/XPDFRenderer.h
@@ -35,12 +35,19 @@
 
 #include "globals/UBGlobals.h"
 
-THIRD_PARTY_WARNINGS_DISABLE
-#include <poppler/Object.h>
-#include <poppler/GlobalParams.h>
-#include <poppler/SplashOutputDev.h>
-#include <poppler/PDFDoc.h>
-THIRD_PARTY_WARNINGS_ENABLE
+#ifdef USE_XPDF
+    THIRD_PARTY_WARNINGS_DISABLE
+    #include <xpdf/Object.h>
+    #include <xpdf/GlobalParams.h>
+    #include <xpdf/SplashOutputDev.h>
+    #include <xpdf/PDFDoc.h>
+    THIRD_PARTY_WARNINGS_ENABLE
+#else
+    #include <xpdf/Object.h>
+    #include <xpdf/GlobalParams.h>
+    #include <xpdf/SplashOutputDev.h>
+    #include <xpdf/PDFDoc.h>
+#endif
 
 class PDFDoc;