Fix build with recent Poppler. From d867ec3c386baaed1b8e076dd70b278863411480 Mon Sep 17 00:00:00 2001 From: Jean Ghali Date: Mon, 30 Apr 2018 09:19:33 +0000 Subject: [PATCH] =?UTF-8?q?#15289:=20FTBFS=201.5.4=20with=20error:=20inval?= =?UTF-8?q?id=20conversion=20from=20=E2=80=98const=20GooString*=E2=80=99?= =?UTF-8?q?=20to=20=E2=80=98GooString*=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://scribus.net/trunk/Scribus@22498 11d20701-8431-0410-a711-e3c959e3b870 --- scribus/plugins/import/pdf/importpdf.cpp | 2 +- scribus/plugins/import/pdf/importpdf.h | 2 +- scribus/plugins/import/pdf/slaoutput.cpp | 2 +- scribus/plugins/import/pdf/slaoutput.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp index c1802861aa..d4c5a9ba49 100644 --- a/scribus/plugins/import/pdf/importpdf.cpp +++ b/scribus/plugins/import/pdf/importpdf.cpp @@ -1081,7 +1081,7 @@ QRectF PdfPlug::getCBox(int box, int pgNum) return cRect; } -QString PdfPlug::UnicodeParsedString(GooString *s1) +QString PdfPlug::UnicodeParsedString(const GooString *s1) { if ( !s1 || s1->getLength() == 0 ) return QString(); diff --git a/scribus/plugins/import/pdf/importpdf.h b/scribus/plugins/import/pdf/importpdf.h index c8c5efcd0d..5249562692 100644 --- a/scribus/plugins/import/pdf/importpdf.h +++ b/scribus/plugins/import/pdf/importpdf.h @@ -81,7 +81,7 @@ class PdfPlug : public QObject private: bool convert(const QString& fn); QRectF getCBox(int box, int pgNum); - QString UnicodeParsedString(GooString *s1); + QString UnicodeParsedString(const GooString *s1); QList Elements; double baseX, baseY; diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp index be1815dc29..17b6357246 100644 --- a/scribus/plugins/import/pdf/slaoutput.cpp +++ b/scribus/plugins/import/pdf/slaoutput.cpp @@ -4252,7 +4252,7 @@ void SlaOutputDev::pushGroup(QString maskName, GBool forSoftMask, GBool alpha, b m_groupStack.push(gElements); } -QString SlaOutputDev::UnicodeParsedString(GooString *s1) +QString SlaOutputDev::UnicodeParsedString(const GooString *s1) { if ( !s1 || s1->getLength() == 0 ) return QString(); diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h index 20e8b2d311..6698c030e0 100644 --- a/scribus/plugins/import/pdf/slaoutput.h +++ b/scribus/plugins/import/pdf/slaoutput.h @@ -266,7 +266,7 @@ class SlaOutputDev : public OutputDev int getBlendMode(GfxState *state); void applyMask(PageItem *ite); void pushGroup(QString maskName = "", GBool forSoftMask = gFalse, GBool alpha = gFalse, bool inverted = false); - QString UnicodeParsedString(GooString *s1); + QString UnicodeParsedString(const GooString *s1); bool checkClip(); bool pathIsClosed; QString CurrColorFill;