casa-mp-base

From 7d4ceeb5cac32287769e3c0238699e0b3e56c24d Mon Sep 17 00:00:00 2001

From: Jean Ghali <jghali@libertysurf.fr>

Date: Wed, 2 May 2018 14:22:50 +0000

Subject: [PATCH] #15289: FTBFS when using poppler 0.64.0

​

git-svn-id: svn://scribus.net/trunk/Scribus@22513 11d20701-8431-0410-a711-e3c959e3b870

---

 scribus/plugins/import/pdf/slaoutput.cpp | 42 +++++++++++++++++---------------

 scribus/plugins/import/pdf/slaoutput.h   | 26 +++++++++++++++-----

 2 files changed, 42 insertions(+), 26 deletions(-)

​

diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp

index 257deb30c6..96847508ba 100644

--- scribus/plugins/import/pdf/slaoutput.cpp

+++ scribus/plugins/import/pdf/slaoutput.cpp

@@ -6,7 +6,7 @@ for which a new license (GPL+exception) is in place.

 */

 #include "slaoutput.h"

-#include <poppler/cpp/poppler-version.h>

+

 #include <poppler/GlobalParams.h>

 #include <poppler/poppler-config.h>

 #include <poppler/FileSpec.h>

@@ -20,12 +20,6 @@ for which a new license (GPL+exception) is in place.

 #include "util_math.h"

 #include <tiffio.h>

-#define POPPLER_VERSION_ENCODE(major, minor, micro) (  \

-     ((major) * 10000)             \

-   + ((minor) *   100)             \

-   + ((micro) *     1))

-#define POPPLER_ENCODED_VERSION POPPLER_VERSION_ENCODE(POPPLER_VERSION_MAJOR, POPPLER_VERSION_MINOR, POPPLER_VERSION_MICRO)

-

 LinkSubmitForm::LinkSubmitForm(Object *actionObj)

 {

    Object obj1, obj2, obj3;

@@ -44,7 +38,7 @@ LinkSubmitForm::LinkSubmitForm(Object *actionObj)

                {

                    if (obj3.isName())

                    {

-                       char *name = obj3.getName();

+                       POPPLER_CONST char *name = obj3.getName();

                        if (!strcmp(name, "URL"))

                        {

                            obj2 = obj1.dictLookup("F");

@@ -508,8 +502,8 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do

    QString fileName = "";

    if (act->getKind() == actionGoTo)

    {

-       LinkGoTo *gto = (LinkGoTo*)act;

-       LinkDest *dst = gto->getDest();

+       LinkGoTo *gto = (LinkGoTo*) act;

+       POPPLER_CONST LinkDest *dst = gto->getDest();

        if (dst)

        {

            if (dst->getKind() == destXYZ)

@@ -528,7 +522,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do

        }

        else

        {

-           GooString *ndst = gto->getNamedDest();

+           POPPLER_CONST GooString *ndst = gto->getNamedDest();