diff options
| author | Piotr Kubaj <pkubaj@FreeBSD.org> | 2019-08-16 01:55:18 +0000 |
|---|---|---|
| committer | Piotr Kubaj <pkubaj@FreeBSD.org> | 2019-08-16 01:55:18 +0000 |
| commit | e3a68742952dd4bca213e2b87e279c994049fa07 (patch) | |
| tree | e0bd6286f46fe745df31670005ae2ff76a0f5c67 | |
| parent | misc/gobuster: Switch to USES=go:modules, fix build with go1.13 (diff) | |
print/scribus-devel: update to 1.5.5
Release notes: https://wiki.scribus.net/canvas/1.5.5_Release
Approved by: mat (mentor)
Differential Revision: https://reviews.freebsd.org/D21238
Notes
Notes:
svn path=/head/; revision=509063
10 files changed, 398 insertions, 1457 deletions
diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile index b9dc71e233fc..645478f3edf8 100644 --- a/print/scribus-devel/Makefile +++ b/print/scribus-devel/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= scribus -PORTVERSION= 1.5.4 -PORTREVISION= 14 +PORTVERSION= 1.5.5 CATEGORIES= print editors MASTER_SITES= SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION}/ \ http://www.scribus.net/downloads/${PORTVERSION}/ diff --git a/print/scribus-devel/distinfo b/print/scribus-devel/distinfo index 4a57038e57d8..a2c11c32980e 100644 --- a/print/scribus-devel/distinfo +++ b/print/scribus-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1538746925 -SHA256 (scribus-1.5.4.tar.xz) = 6480925250b2bb07028e2f378c02b67fe3e33206743671e03c07c701cd05da03 -SIZE (scribus-1.5.4.tar.xz) = 72832248 +TIMESTAMP = 1565628826 +SHA256 (scribus-1.5.5.tar.xz) = 7908b21a6ce843269f58cedf5f8f791893257e6201cce5fbddc70daca2fe3f71 +SIZE (scribus-1.5.5.tar.xz) = 73861836 diff --git a/print/scribus-devel/files/patch-archgit_poppler-0.75 b/print/scribus-devel/files/patch-archgit_poppler-0.75 deleted file mode 100644 index 43fa89cd47a4..000000000000 --- a/print/scribus-devel/files/patch-archgit_poppler-0.75 +++ /dev/null @@ -1,41 +0,0 @@ ---- scribus/plugins/import/pdf/importpdf.cpp.orig 2019-03-22 09:47:14.760191871 +0000 -+++ scribus/plugins/import/pdf/importpdf.cpp 2019-03-22 09:47:37.363809447 +0000 -@@ -535,7 +535,7 @@ - if (orderItem.isDict()) - { - #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 58, 0) -- Object ref = order->getNF(i); -+ Object ref = order->getNF(i).copy(); - #else - Object ref; - order->getNF(i, &ref); ---- scribus/plugins/import/pdf/slaoutput.cpp.orig 2019-03-22 10:02:43.145371895 +0000 -+++ scribus/plugins/import/pdf/slaoutput.cpp 2019-03-22 10:07:03.085386627 +0000 -@@ -310,7 +310,7 @@ - if (obj.isDict()) - { - Dict* adic = obj.getDict(); -- additionalActions = adic->lookupNF("A"); -+ additionalActions = adic->lookupNF("A").copy(); - Object additionalActionsObject = additionalActions.fetch(pdfDoc->getXRef()); - if (additionalActionsObject.isDict()) - { -@@ -370,7 +370,7 @@ - if (obj.isDict()) - { - Dict* adic = obj.getDict(); -- additionalActions = adic->lookupNF("AA"); -+ additionalActions = adic->lookupNF("AA").copy(); - Object additionalActionsObject = additionalActions.fetch(pdfDoc->getXRef()); - if (additionalActionsObject.isDict()) - { -@@ -939,7 +939,7 @@ - QList<int> radList; - for (int i = 0; i < obj2.arrayGetLength(); i++) - { -- Object childRef = obj2.arrayGetNF(i); -+ Object childRef = obj2.arrayGetNF(i).copy(); - if (!childRef.isRef()) - continue; - Object childObj = obj2.arrayGet(i); - diff --git a/print/scribus-devel/files/patch-scribus_plugins_import_pdf_importpdf.cpp b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_importpdf.cpp deleted file mode 100644 index 943d3b6cfed8..000000000000 --- a/print/scribus-devel/files/patch-scribus_plugins_import_pdf_importpdf.cpp +++ /dev/null @@ -1,150 +0,0 @@ ---- scribus/plugins/import/pdf/importpdf.cpp.orig 2018-12-11 12:42:54 UTC -+++ scribus/plugins/import/pdf/importpdf.cpp -@@ -87,7 +87,7 @@ QImage PdfPlug::readThumbnail(QString fName) - #else - GooString *fname = new GooString(QFile::encodeName(pdfFile).data()); - #endif -- globalParams->setErrQuiet(gTrue); -+ globalParams->setErrQuiet(true); - PDFDoc *pdfDoc = new PDFDoc(fname, NULL, NULL, NULL); - if (pdfDoc) - { -@@ -108,11 +108,11 @@ QImage PdfPlug::readThumbnail(QString fName) - bgColor[0] = 255; - bgColor[1] = 255; - bgColor[2] = 255; -- SplashOutputDev *dev = new SplashOutputDev(splashModeXBGR8, 4, gFalse, bgColor, gTrue); -- dev->setVectorAntialias(gTrue); -- dev->setFreeTypeHinting(gTrue, gFalse); -+ SplashOutputDev *dev = new SplashOutputDev(splashModeXBGR8, 4, false, bgColor, true); -+ dev->setVectorAntialias(true); -+ dev->setFreeTypeHinting(true, false); - dev->startDoc(pdfDoc); -- pdfDoc->displayPage(dev, 1, hDPI, vDPI, 0, gTrue, gFalse, gFalse); -+ pdfDoc->displayPage(dev, 1, hDPI, vDPI, 0, true, false, false); - SplashBitmap *bitmap = dev->getBitmap(); - int bw = bitmap->getWidth(); - int bh = bitmap->getHeight(); -@@ -410,10 +410,10 @@ bool PdfPlug::convert(const QString& fn) - #else - GooString *fname = new GooString(QFile::encodeName(fn).data()); - #endif -- globalParams->setErrQuiet(gTrue); -- GBool hasOcg = gFalse; -+ globalParams->setErrQuiet(true); -+ bool hasOcg = false; - QList<OptionalContentGroup*> ocgGroups; --// globalParams->setPrintCommands(gTrue); -+// globalParams->setPrintCommands(true); - PDFDoc *pdfDoc = new PDFDoc(fname, NULL, NULL, NULL); - if (pdfDoc) - { -@@ -458,10 +458,10 @@ bool PdfPlug::convert(const QString& fn) - double vDPI = 72.0; - int firstPage = 1; - int lastPage = pdfDoc->getNumPages(); -- GBool useMediaBox = gTrue; -- GBool crop = gTrue; -- GBool printing = gFalse; -- PDFRectangle *mediaBox = pdfDoc->getPage(1)->getMediaBox(); -+ bool useMediaBox = true; -+ bool crop = true; -+ bool printing = false; -+ const PDFRectangle *mediaBox = pdfDoc->getPage(1)->getMediaBox(); - QRectF mediaRect = QRectF(QPointF(mediaBox->x1, mediaBox->y1), QPointF(mediaBox->x2, mediaBox->y2)).normalized(); - bool boxesAreDifferent = false; - if (getCBox(Crop_Box, 1) != mediaRect) -@@ -497,7 +497,7 @@ bool PdfPlug::convert(const QString& fn) - if (!cropped) - crop = cropped; - if (contentRect != Media_Box) -- useMediaBox = gFalse; -+ useMediaBox = false; - /* if (cb > Media_Box) - { - cropped = true; -@@ -556,12 +556,10 @@ bool PdfPlug::convert(const QString& fn) - } - else - { -- GooList *ocgs; -- int i; -- ocgs = ocg->getOCGs (); -- for (i = 0; i < ocgs->getLength (); ++i) -+ const auto& ocgs = ocg->getOCGs (); -+ for (const auto& ocg : ocgs) - { -- OptionalContentGroup *oc = (OptionalContentGroup *)ocgs->get(i); -+ OptionalContentGroup *oc = ocg.second.get(); - QString ocgName = UnicodeParsedString(oc->getName()); - if (!ocgNames.contains(ocgName)) - { -@@ -574,12 +572,10 @@ bool PdfPlug::convert(const QString& fn) - } - else - { -- GooList *ocgs; -- int i; -- ocgs = ocg->getOCGs (); -- for (i = 0; i < ocgs->getLength (); ++i) -+ const auto& ocgs = ocg->getOCGs (); -+ for (const auto& ocg : ocgs) - { -- OptionalContentGroup *oc = (OptionalContentGroup *)ocgs->get(i); -+ OptionalContentGroup *oc = ocg.second.get(); - QString ocgName = UnicodeParsedString(oc->getName()); - if (!ocgNames.contains(ocgName)) - { -@@ -1018,11 +1014,11 @@ QImage PdfPlug::readPreview(int pgNum, int width, int - bgColor[0] = 255; - bgColor[1] = 255; - bgColor[2] = 255; -- SplashOutputDev *dev = new SplashOutputDev(splashModeXBGR8, 4, gFalse, bgColor, gTrue); -- dev->setVectorAntialias(gTrue); -- dev->setFreeTypeHinting(gTrue, gFalse); -+ SplashOutputDev *dev = new SplashOutputDev(splashModeXBGR8, 4, false, bgColor, true); -+ dev->setVectorAntialias(true); -+ dev->setFreeTypeHinting(true, false); - dev->startDoc(m_pdfDoc); -- m_pdfDoc->displayPage(dev, pgNum, hDPI, vDPI, 0, gTrue, gFalse, gFalse); -+ m_pdfDoc->displayPage(dev, pgNum, hDPI, vDPI, 0, true, false, false); - SplashBitmap *bitmap = dev->getBitmap(); - int bw = bitmap->getWidth(); - int bh = bitmap->getHeight(); -@@ -1066,7 +1062,7 @@ QImage PdfPlug::readPreview(int pgNum, int width, int - - QRectF PdfPlug::getCBox(int box, int pgNum) - { -- PDFRectangle *cBox = NULL; -+ const PDFRectangle *cBox = NULL; - if (box == Media_Box) - cBox = m_pdfDoc->getPage(pgNum)->getMediaBox(); - else if (box == Bleed_Box) -@@ -1081,23 +1077,23 @@ 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(); -- GBool isUnicode; -+ bool isUnicode; - int i; - Unicode u; - QString result; - if ((s1->getChar(0) & 0xff) == 0xfe && (s1->getLength() > 1 && (s1->getChar(1) & 0xff) == 0xff)) - { -- isUnicode = gTrue; -+ isUnicode = true; - i = 2; - result.reserve((s1->getLength() - 2) / 2); - } - else - { -- isUnicode = gFalse; -+ isUnicode = false; - i = 0; - result.reserve(s1->getLength()); - } diff --git a/print/scribus-devel/files/patch-scribus_plugins_import_pdf_importpdf.h b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_importpdf.h deleted file mode 100644 index 13639019aaeb..000000000000 --- a/print/scribus-devel/files/patch-scribus_plugins_import_pdf_importpdf.h +++ /dev/null @@ -1,11 +0,0 @@ ---- scribus/plugins/import/pdf/importpdf.h.orig 2018-12-11 12:48:12 UTC -+++ scribus/plugins/import/pdf/importpdf.h -@@ -81,7 +81,7 @@ class PdfPlug : public QObject (public) - private: - bool convert(const QString& fn); - QRectF getCBox(int box, int pgNum); -- QString UnicodeParsedString(GooString *s1); -+ QString UnicodeParsedString(const GooString *s1); - - QList<PageItem*> Elements; - double baseX, baseY; diff --git a/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp deleted file mode 100644 index c57aa07648cd..000000000000 --- a/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp +++ /dev/null @@ -1,935 +0,0 @@ ---- scribus/plugins/import/pdf/slaoutput.cpp.orig 2019-01-10 06:21:56 UTC -+++ scribus/plugins/import/pdf/slaoutput.cpp -@@ -44,7 +44,7 @@ LinkSubmitForm::LinkSubmitForm(Object *actionObj) - { - if (obj3.isName()) - { -- char *name = obj3.getName(); -+ const char *name = obj3.getName(); - if (!strcmp(name, "URL")) - { - obj2 = obj1.dictLookup("F"); -@@ -179,7 +179,7 @@ void AnoOutputDev::stroke(GfxState *state) - CurrColorStroke = getColor(state->getStrokeColorSpace(), state->getStrokeColor(), &shade); - } - --void AnoOutputDev::drawString(GfxState *state, GooString *s) -+void AnoOutputDev::drawString(GfxState *state, const GooString *s) - { - int shade = 100; - CurrColorText = getColor(state->getFillColorSpace(), state->getFillColor(), &shade); -@@ -189,7 +189,7 @@ void AnoOutputDev::drawString(GfxState *state, GooStri - m_itemText = s->copy(); - } - --QString AnoOutputDev::getColor(GfxColorSpace *color_space, GfxColor *color, int *shade) -+QString AnoOutputDev::getColor(GfxColorSpace *color_space, const GfxColor *color, int *shade) - { - QString fNam; - QString namPrefix = "FromPDF"; -@@ -229,7 +229,7 @@ QString AnoOutputDev::getColor(GfxColorSpace *color_sp - else if (color_space->getMode() == csSeparation) - { - GfxCMYK cmyk; -- QString name = QString(((GfxSeparationColorSpace*)color_space)->getName()->getCString()); -+ QString name = QString(((GfxSeparationColorSpace*)color_space)->getName()->c_str()); - double Cc, Mc, Yc, Kc; - bool isRegistrationColor = (name == "All"); - if (!isRegistrationColor) -@@ -410,7 +410,7 @@ LinkAction* SlaOutputDev::SC_getAdditionalAction(const - return linkAction; - } - --GBool SlaOutputDev::annotations_callback(Annot *annota, void *user_data) -+bool SlaOutputDev::annotations_callback(Annot *annota, void *user_data) - { - SlaOutputDev *dev = (SlaOutputDev*)user_data; - PDFRectangle *box = annota->getRect(); -@@ -509,7 +509,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, doub - if (act->getKind() == actionGoTo) - { - LinkGoTo *gto = (LinkGoTo*)act; -- LinkDest *dst = gto->getDest(); -+ const LinkDest *dst = gto->getDest(); - if (dst) - { - if (dst->getKind() == destXYZ) -@@ -528,10 +528,10 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, doub - } - else - { -- GooString *ndst = gto->getNamedDest(); -+ const GooString *ndst = gto->getNamedDest(); - if (ndst) - { -- LinkDest *dstn = pdfDoc->findDest(ndst); -+ const LinkDest *dstn = pdfDoc->findDest(ndst); - if (dstn) - { - if (dstn->getKind() == destXYZ) -@@ -555,7 +555,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, doub - { - LinkGoToR *gto = (LinkGoToR*)act; - fileName = UnicodeParsedString(gto->getFileName()); -- LinkDest *dst = gto->getDest(); -+ const LinkDest *dst = gto->getDest(); - if (dst) - { - if (dst->getKind() == destXYZ) -@@ -568,10 +568,10 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, doub - } - else - { -- GooString *ndst = gto->getNamedDest(); -+ const GooString *ndst = gto->getNamedDest(); - if (ndst) - { -- LinkDest *dstn = pdfDoc->findDest(ndst); -+ const LinkDest *dstn = pdfDoc->findDest(ndst); - if (dstn) - { - if (dstn->getKind() == destXYZ) -@@ -709,7 +709,7 @@ bool SlaOutputDev::handleWidgetAnnot(Annot* annota, do - bool bgFound = false; - if (achar) - { -- AnnotColor *bgCol = achar->getBackColor(); -+ const AnnotColor *bgCol = achar->getBackColor(); - if (bgCol) - { - bgFound = true; -@@ -717,7 +717,7 @@ bool SlaOutputDev::handleWidgetAnnot(Annot* annota, do - } - else - CurrColorFill = CommonStrings::None; -- AnnotColor *fgCol = achar->getBorderColor(); -+ const AnnotColor *fgCol = achar->getBorderColor(); - if (fgCol) - { - fgFound = true; -@@ -1054,7 +1054,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotW - int xco = 0; - int yco = 0; - LinkGoTo *gto = (LinkGoTo*)Lact; -- LinkDest *dst = gto->getDest(); -+ const LinkDest *dst = gto->getDest(); - if (dst) - { - if (dst->getKind() == destXYZ) -@@ -1075,10 +1075,10 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotW - } - else - { -- GooString *ndst = gto->getNamedDest(); -+ const GooString *ndst = gto->getNamedDest(); - if (ndst) - { -- LinkDest *dstn = pdfDoc->findDest(ndst); -+ const LinkDest *dstn = pdfDoc->findDest(ndst); - if (dstn) - { - if (dstn->getKind() == destXYZ) -@@ -1107,7 +1107,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotW - int yco = 0; - LinkGoToR *gto = (LinkGoToR*)Lact; - QString fileName = UnicodeParsedString(gto->getFileName()); -- LinkDest *dst = gto->getDest(); -+ const LinkDest *dst = gto->getDest(); - if (dst) - { - if (dst->getKind() == destXYZ) -@@ -1123,10 +1123,10 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotW - } - else - { -- GooString *ndst = gto->getNamedDest(); -+ const GooString *ndst = gto->getNamedDest(); - if (ndst) - { -- LinkDest *dstn = pdfDoc->findDest(ndst); -+ const LinkDest *dstn = pdfDoc->findDest(ndst); - if (dstn) - { - if (dstn->getKind() == destXYZ) -@@ -1462,7 +1462,7 @@ void SlaOutputDev::restoreState(GfxState *state) - m_currentClipPath = m_clipPaths.pop(); - } - --void SlaOutputDev::beginTransparencyGroup(GfxState *state, double *bbox, GfxColorSpace * /*blendingColorSpace*/, GBool isolated, GBool knockout, GBool forSoftMask) -+void SlaOutputDev::beginTransparencyGroup(GfxState *state, double *bbox, GfxColorSpace * /*blendingColorSpace*/, bool isolated, bool knockout, bool forSoftMask) - { - pushGroup("", forSoftMask); - m_groupStack.top().isolated = isolated; -@@ -1562,7 +1562,7 @@ void SlaOutputDev::endTransparencyGroup(GfxState *stat - } - } - --void SlaOutputDev::setSoftMask(GfxState * /*state*/, double * /*bbox*/, GBool alpha, Function *transferFunc, GfxColor * /*backdropColor*/) -+void SlaOutputDev::setSoftMask(GfxState * /*state*/, const double * /*bbox*/, bool alpha, Function *transferFunc, GfxColor * /*backdropColor*/) - { - if (m_groupStack.count() != 0) - { -@@ -1604,8 +1604,7 @@ void SlaOutputDev::updateStrokeColor(GfxState *state) - void SlaOutputDev::clip(GfxState *state) - { - // qDebug() << "Clip"; -- double *ctm; -- ctm = state->getCTM(); -+ const double *ctm = state->getCTM(); - m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); - QString output = convertPath(state->getPath()); - FPointArray out; -@@ -1641,8 +1640,7 @@ void SlaOutputDev::clip(GfxState *state) - void SlaOutputDev::eoClip(GfxState *state) - { - // qDebug() << "EoClip"; -- double *ctm; -- ctm = state->getCTM(); -+ const double *ctm = state->getCTM(); - m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); - QString output = convertPath(state->getPath()); - FPointArray out; -@@ -1678,7 +1676,7 @@ void SlaOutputDev::eoClip(GfxState *state) - void SlaOutputDev::stroke(GfxState *state) - { - // qDebug() << "Stroke"; -- double *ctm; -+ const double *ctm; - ctm = state->getCTM(); - double xCoor = m_doc->currentPage()->xOffset(); - double yCoor = m_doc->currentPage()->yOffset(); -@@ -1770,7 +1768,7 @@ void SlaOutputDev::stroke(GfxState *state) - void SlaOutputDev::fill(GfxState *state) - { - // qDebug() << "Fill"; -- double *ctm; -+ const double *ctm; - ctm = state->getCTM(); - double xCoor = m_doc->currentPage()->xOffset(); - double yCoor = m_doc->currentPage()->yOffset(); -@@ -1815,7 +1813,7 @@ void SlaOutputDev::fill(GfxState *state) - void SlaOutputDev::eoFill(GfxState *state) - { - // qDebug() << "EoFill"; -- double *ctm; -+ const double *ctm; - ctm = state->getCTM(); - double xCoor = m_doc->currentPage()->xOffset(); - double yCoor = m_doc->currentPage()->yOffset(); -@@ -1857,21 +1855,21 @@ void SlaOutputDev::eoFill(GfxState *state) - } - } - --GBool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax) -+bool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax) - { - double GrStartX; - double GrStartY; - double GrEndX; - double GrEndY; - int shade = 100; -- Function *func = shading->getFunc(0); -+ const Function *func = shading->getFunc(0); - VGradient FillGradient = VGradient(VGradient::linear); - FillGradient.clearStops(); - GfxColorSpace *color_space = shading->getColorSpace(); - if (func->getType() == 3) - { - StitchingFunction *stitchingFunc = (StitchingFunction*)func; -- double *bounds = stitchingFunc->getBounds(); -+ const double *bounds = stitchingFunc->getBounds(); - int num_funcs = stitchingFunc->getNumFuncs(); - // Add stops from all the stitched functions - for ( int i = 0 ; i < num_funcs ; i++ ) -@@ -1905,8 +1903,7 @@ GBool SlaOutputDev::axialShadedFill(GfxState *state, G - state->getClipBBox(&xmin, &ymin, &xmax, &ymax); - QRectF crect = QRectF(QPointF(xmin, ymin), QPointF(xmax, ymax)); - crect = crect.normalized(); -- double *ctm; -- ctm = state->getCTM(); -+ const double *ctm = state->getCTM(); - m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); - FPointArray gr; - gr.addPoint(GrStartX, GrStartY); -@@ -1965,24 +1962,24 @@ GBool SlaOutputDev::axialShadedFill(GfxState *state, G - m_groupStack.top().Items.append(ite); - applyMask(ite); - } -- return gTrue; -+ return true; - } - --GBool SlaOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading, double sMin, double sMax) -+bool SlaOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading, double sMin, double sMax) - { - double GrStartX; - double GrStartY; - double GrEndX; - double GrEndY; - int shade = 100; -- Function *func = shading->getFunc(0); -+ const Function *func = shading->getFunc(0); - VGradient FillGradient = VGradient(VGradient::linear); - FillGradient.clearStops(); - GfxColorSpace *color_space = shading->getColorSpace(); - if (func->getType() == 3) - { - StitchingFunction *stitchingFunc = (StitchingFunction*)func; -- double *bounds = stitchingFunc->getBounds(); -+ const double *bounds = stitchingFunc->getBounds(); - int num_funcs = stitchingFunc->getNumFuncs(); - // Add stops from all the stitched functions - for ( int i = 0 ; i < num_funcs ; i++ ) -@@ -2021,8 +2018,7 @@ GBool SlaOutputDev::radialShadedFill(GfxState *state, - double GrFocalY = y1; - GrEndX = GrFocalX + r1; - GrEndY = GrFocalY; -- double *ctm; -- ctm = state->getCTM(); -+ const double *ctm = state->getCTM(); - m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); - FPointArray gr; - gr.addPoint(GrStartX, GrStartY); -@@ -2084,10 +2080,10 @@ GBool SlaOutputDev::radialShadedFill(GfxState *state, - m_groupStack.top().Items.append(ite); - applyMask(ite); - } -- return gTrue; -+ return true; - } - --GBool SlaOutputDev::gouraudTriangleShadedFill(GfxState *state, GfxGouraudTriangleShading *shading) -+bool SlaOutputDev::gouraudTriangleShadedFill(GfxState *state, GfxGouraudTriangleShading *shading) - { - double xCoor = m_doc->currentPage()->xOffset(); - double yCoor = m_doc->currentPage()->yOffset(); -@@ -2104,8 +2100,7 @@ GBool SlaOutputDev::gouraudTriangleShadedFill(GfxState - output += QString("Z"); - pathIsClosed = true; - Coords = output; -- double *ctm; -- ctm = state->getCTM(); -+ const double *ctm = state->getCTM(); - m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); - int z = m_doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xCoor + crect.x(), yCoor + crect.y(), crect.width(), crect.height(), 0, CurrColorFill, CommonStrings::None); - PageItem* ite = m_doc->Items->at(z); -@@ -2164,10 +2159,10 @@ GBool SlaOutputDev::gouraudTriangleShadedFill(GfxState - ite->meshGradientPatches.append(patchM); - } - ite->GrType = 12; -- return gTrue; -+ return true; - } - --GBool SlaOutputDev::patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *shading) -+bool SlaOutputDev::patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *shading) - { - // qDebug() << "mesh shaded fill"; - double xCoor = m_doc->currentPage()->xOffset(); -@@ -2185,8 +2180,7 @@ GBool SlaOutputDev::patchMeshShadedFill(GfxState *stat - output += QString("Z"); - pathIsClosed = true; - Coords = output; -- double *ctm; -- ctm = state->getCTM(); -+ const double *ctm = state->getCTM(); - m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); - int z = m_doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xCoor + crect.x(), yCoor + crect.y(), crect.width(), crect.height(), 0, CurrColorFill, CommonStrings::None); - PageItem* ite = m_doc->Items->at(z); -@@ -2211,7 +2205,7 @@ GBool SlaOutputDev::patchMeshShadedFill(GfxState *stat - for (int i = 0; i < shading->getNPatches(); i++) - { - int shade = 100; -- GfxPatch *patch = shading->getPatch(i); -+ const GfxPatch *patch = shading->getPatch(i); - GfxColor color; - meshGradientPatch patchM; - int u, v; -@@ -2314,18 +2308,18 @@ GBool SlaOutputDev::patchMeshShadedFill(GfxState *stat - ite->meshGradientPatches.append(patchM); - } - ite->GrType = 12; -- return gTrue; -+ return true; - } - --GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, double *pmat, int paintType, int tilingType, Dict *resDict, double *mat, double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) -+bool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, double *pmat, int paintType, int tilingType, Dict *resDict, double *mat, double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) - { - PDFRectangle box; - Gfx *gfx; - QString id; - PageItem *ite; - groupEntry gElements; -- gElements.forSoftMask = gFalse; -- gElements.alpha = gFalse; -+ gElements.forSoftMask = false; -+ gElements.alpha = false; - gElements.inverted = false; - gElements.maskName = ""; - gElements.Items.clear(); -@@ -2334,13 +2328,12 @@ GBool SlaOutputDev::tilingPatternFill(GfxState *state, - width = bbox[2] - bbox[0]; - height = bbox[3] - bbox[1]; - if (xStep != width || yStep != height) -- return gFalse; -+ return false; - box.x1 = bbox[0]; - box.y1 = bbox[1]; - box.x2 = bbox[2]; - box.y2 = bbox[3]; -- double *ctm; -- ctm = state->getCTM(); -+ const double *ctm = state->getCTM(); - m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); - QTransform mm = QTransform(mat[0], mat[1], mat[2], mat[3], mat[4], mat[5]); - QTransform mmx = mm * m_ctm; -@@ -2437,10 +2430,10 @@ GBool SlaOutputDev::tilingPatternFill(GfxState *state, - applyMask(ite); - } - delete gfx; -- return gTrue; -+ return true; - } - --void SlaOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool interpolate, GBool inlineImg) -+void SlaOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, bool invert, bool interpolate, bool inlineImg) - { - // qDebug() << "Draw Image Mask"; - QImage * image = 0; -@@ -2449,7 +2442,7 @@ void SlaOutputDev::drawImageMask(GfxState *state, Obje - int x, y, i, bit; - unsigned char *dest = 0; - unsigned char *buffer; -- Guchar *pix; -+ unsigned char *pix; - ImageStream * imgStr = new ImageStream(str, width, 1, 1); - imgStr->reset(); - #ifdef WORDS_BIGENDIAN -@@ -2512,8 +2505,7 @@ void SlaOutputDev::drawImageMask(GfxState *state, Obje - t++; - } - } -- double *ctm; -- ctm = state->getCTM(); -+ const double *ctm = state->getCTM(); - double xCoor = m_doc->currentPage()->xOffset(); - double yCoor = m_doc->currentPage()->yOffset(); - QRectF crect = QRectF(0, 0, width, height); -@@ -2605,8 +2597,8 @@ void SlaOutputDev::drawImageMask(GfxState *state, Obje - delete image; - } - --void SlaOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, Stream *maskStr, int maskWidth, int maskHeight, -- GfxImageColorMap *maskColorMap, GBool maskInterpolate) -+void SlaOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, Stream *maskStr, int maskWidth, int maskHeight, -+ GfxImageColorMap *maskColorMap, bool maskInterpolate) - { - // qDebug() << "Masked Image Components" << colorMap->getNumPixelComps(); - ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); -@@ -2617,7 +2609,7 @@ void SlaOutputDev::drawSoftMaskedImage(GfxState *state - for (int y = 0; y < height; y++) - { - dest = (unsigned int *)(buffer + y * 4 * width); -- Guchar * pix = imgStr->getLine(); -+ unsigned char * pix = imgStr->getLine(); - colorMap->getRGBLine(pix, dest, width); - } - image = new QImage(buffer, width, height, QImage::Format_RGB32); -@@ -2630,13 +2622,13 @@ void SlaOutputDev::drawSoftMaskedImage(GfxState *state - } - ImageStream *mskStr = new ImageStream(maskStr, maskWidth, maskColorMap->getNumPixelComps(), maskColorMap->getBits()); - mskStr->reset(); -- Guchar *mdest = 0; -+ unsigned char *mdest = 0; - unsigned char * mbuffer = new unsigned char[maskWidth * maskHeight]; - memset(mbuffer, 0, maskWidth * maskHeight); - for (int y = 0; y < maskHeight; y++) - { -- mdest = (Guchar *)(mbuffer + y * maskWidth); -- Guchar * pix = mskStr->getLine(); -+ mdest = (unsigned char *)(mbuffer + y * maskWidth); -+ unsigned char * pix = mskStr->getLine(); - maskColorMap->getGrayLine(pix, mdest, maskWidth); - } - if ((maskWidth != width) || (maskHeight != height)) -@@ -2658,8 +2650,7 @@ void SlaOutputDev::drawSoftMaskedImage(GfxState *state - t++; - } - } -- double *ctm; -- ctm = state->getCTM(); -+ const double *ctm = state->getCTM(); - double xCoor = m_doc->currentPage()->xOffset(); - double yCoor = m_doc->currentPage()->yOffset(); - QRectF crect = QRectF(0, 0, width, height); -@@ -2750,7 +2741,7 @@ void SlaOutputDev::drawSoftMaskedImage(GfxState *state - delete[] mbuffer; - } - --void SlaOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, Stream *maskStr, int maskWidth, int maskHeight, GBool maskInvert, GBool maskInterpolate) -+void SlaOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, Stream *maskStr, int maskWidth, int maskHeight, bool maskInvert, bool maskInterpolate) - { - ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); - imgStr->reset(); -@@ -2760,7 +2751,7 @@ void SlaOutputDev::drawMaskedImage(GfxState *state, Ob - for (int y = 0; y < height; y++) - { - dest = (unsigned int *)(buffer + y * 4 * width); -- Guchar * pix = imgStr->getLine(); -+ unsigned char * pix = imgStr->getLine(); - colorMap->getRGBLine(pix, dest, width); - } - image = new QImage(buffer, width, height, QImage::Format_RGB32); -@@ -2773,14 +2764,14 @@ void SlaOutputDev::drawMaskedImage(GfxState *state, Ob - } - ImageStream *mskStr = new ImageStream(maskStr, maskWidth, 1, 1); - mskStr->reset(); -- Guchar *mdest = 0; -+ unsigned char *mdest = 0; - int invert_bit = maskInvert ? 1 : 0; - unsigned char * mbuffer = new unsigned char[maskWidth * maskHeight]; - memset(mbuffer, 0, maskWidth * maskHeight); - for (int y = 0; y < maskHeight; y++) - { -- mdest = (Guchar *)(mbuffer + y * maskWidth); -- Guchar * pix = mskStr->getLine(); -+ mdest = (unsigned char *)(mbuffer + y * maskWidth); -+ unsigned char * pix = mskStr->getLine(); - for (int x = 0; x < maskWidth; x++) - { - if (pix[x] ^ invert_bit) -@@ -2808,8 +2799,7 @@ void SlaOutputDev::drawMaskedImage(GfxState *state, Ob - t++; - } - } -- double *ctm; -- ctm = state->getCTM(); -+ const double *ctm = state->getCTM(); - double xCoor = m_doc->currentPage()->xOffset(); - double yCoor = m_doc->currentPage()->yOffset(); - QRectF crect = QRectF(0, 0, width, height); -@@ -2900,7 +2890,7 @@ void SlaOutputDev::drawMaskedImage(GfxState *state, Ob - delete[] mbuffer; - } - --void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg) -+void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, int *maskColors, bool inlineImg) - { - ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); - // qDebug() << "Image Components" << colorMap->getNumPixelComps() << "Mask" << maskColors; -@@ -2912,7 +2902,7 @@ void SlaOutputDev::drawImage(GfxState *state, Object * - for (int y = 0; y < height; y++) - { - QRgb *s = (QRgb*)(image->scanLine(y)); -- Guchar *pix = imgStr->getLine(); -+ unsigned char *pix = imgStr->getLine(); - for (int x = 0; x < width; x++) - { - GfxRGB rgb; -@@ -2940,7 +2930,7 @@ void SlaOutputDev::drawImage(GfxState *state, Object * - for (int y = 0; y < height; y++) - { - QRgb *s = (QRgb*)(image->scanLine(y)); -- Guchar *pix = imgStr->getLine(); -+ unsigned char *pix = imgStr->getLine(); - for (int x = 0; x < width; x++) - { - if (colorMap->getNumPixelComps() == 4) -@@ -2973,8 +2963,7 @@ void SlaOutputDev::drawImage(GfxState *state, Object * - delete image; - return; - } -- double *ctm; -- ctm = state->getCTM(); -+ const double *ctm = state->getCTM(); - double xCoor = m_doc->currentPage()->xOffset(); - double yCoor = m_doc->currentPage()->yOffset(); - QRectF crect = QRectF(0, 0, width, height); -@@ -3103,7 +3092,7 @@ void SlaOutputDev::drawImage(GfxState *state, Object * - delete image; - } - --void SlaOutputDev::beginMarkedContent(char *name, Object *dictRef) -+void SlaOutputDev::beginMarkedContent(const char *name, Object *dictRef) - { - mContent mSte; - mSte.name = QString(name); -@@ -3172,7 +3161,7 @@ void SlaOutputDev::beginMarkedContent(char *name, Obje - m_mcStack.push(mSte); - } - --void SlaOutputDev::beginMarkedContent(char *name, Dict *properties) -+void SlaOutputDev::beginMarkedContent(const char *name, Dict *properties) - { - // qDebug() << "Begin Marked Content with Name " << QString(name); - QString nam = QString(name); -@@ -3190,13 +3179,13 @@ void SlaOutputDev::beginMarkedContent(char *name, Dict - #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 58, 0) - Object obj = properties->lookup((char*) "Title"); - if (obj.isString()) -- lName = QString(obj.getString()->getCString()); -+ lName = QString(obj.getString()->c_str()); - #else - Object obj; - if (properties->lookup((char*)"Title", &obj)) - { - if (obj.isString()) -- lName = QString(obj.getString()->getCString()); -+ lName = QString(obj.getString()->c_str()); - obj.free(); - } - #endif -@@ -3299,12 +3288,12 @@ void SlaOutputDev::endMarkedContent(GfxState *state) - } - } - --void SlaOutputDev::markPoint(char *name) -+void SlaOutputDev::markPoint(const char *name) - { - // qDebug() << "Begin Marked Point with Name " << QString(name); - } - --void SlaOutputDev::markPoint(char *name, Dict *properties) -+void SlaOutputDev::markPoint(const char *name, Dict *properties) - { - // qDebug() << "Begin Marked Point with Name " << QString(name) << "and Properties"; - beginMarkedContent(name, properties); -@@ -3326,7 +3315,7 @@ void SlaOutputDev::updateFont(GfxState *state) - char *tmpBuf; - int tmpBufLen = 0; - int *codeToGID; -- double *textMat; -+ const double *textMat; - double m11, m12, m21, m22, fontSize; - SplashCoord mat[4]; - int n = 0; -@@ -3355,7 +3344,7 @@ void SlaOutputDev::updateFont(GfxState *state) - - if (!(fontLoc = gfxFont->locateFont(xref, 0))) { - error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'", -- gfxFont->getName() ? gfxFont->getName()->getCString() -+ gfxFont->getName() ? gfxFont->getName()->c_str() - : "(unnamed)"); - goto err2; - } -@@ -3375,9 +3364,9 @@ void SlaOutputDev::updateFont(GfxState *state) - - fontsrc = new SplashFontSrc; - if (fileName) -- fontsrc->setFile(fileName, gFalse); -+ fontsrc->setFile(fileName, false); - else -- fontsrc->setBuf(tmpBuf, tmpBufLen, gTrue); -+ fontsrc->setBuf(tmpBuf, tmpBufLen, true); - - // load the font file - switch (fontType) { -@@ -3388,7 +3377,7 @@ void SlaOutputDev::updateFont(GfxState *state) - (const char **)((Gfx8BitFont *)gfxFont)->getEncoding()))) - { - error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", -- gfxFont->getName() ? gfxFont->getName()->getCString() -+ gfxFont->getName() ? gfxFont->getName()->c_str() - : "(unnamed)"); - goto err2; - } -@@ -3400,7 +3389,7 @@ void SlaOutputDev::updateFont(GfxState *state) - (const char **)((Gfx8BitFont *)gfxFont)->getEncoding()))) - { - error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", -- gfxFont->getName() ? gfxFont->getName()->getCString() -+ gfxFont->getName() ? gfxFont->getName()->c_str() - : "(unnamed)"); - goto err2; - } -@@ -3412,7 +3401,7 @@ void SlaOutputDev::updateFont(GfxState *state) - (const char **)((Gfx8BitFont *)gfxFont)->getEncoding()))) - { - error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", -- gfxFont->getName() ? gfxFont->getName()->getCString() -+ gfxFont->getName() ? gfxFont->getName()->c_str() - : "(unnamed)"); - goto err2; - } -@@ -3420,7 +3409,7 @@ void SlaOutputDev::updateFont(GfxState *state) - case fontTrueType: - case fontTrueTypeOT: - if (fileName) -- ff = FoFiTrueType::load(fileName->getCString()); -+ ff = FoFiTrueType::load(fileName->c_str()); - else - ff = FoFiTrueType::make(tmpBuf, tmpBufLen); - if (ff) { -@@ -3437,7 +3426,7 @@ void SlaOutputDev::updateFont(GfxState *state) - codeToGID, n))) - { - error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", -- gfxFont->getName() ? gfxFont->getName()->getCString() -+ gfxFont->getName() ? gfxFont->getName()->c_str() - : "(unnamed)"); - goto err2; - } -@@ -3449,7 +3438,7 @@ void SlaOutputDev::updateFont(GfxState *state) - fontsrc))) - { - error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", -- gfxFont->getName() ? gfxFont->getName()->getCString() -+ gfxFont->getName() ? gfxFont->getName()->c_str() - : "(unnamed)"); - goto err2; - } -@@ -3470,7 +3459,7 @@ void SlaOutputDev::updateFont(GfxState *state) - codeToGID, n))) - { - error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", -- gfxFont->getName() ? gfxFont->getName()->getCString() -+ gfxFont->getName() ? gfxFont->getName()->c_str() - : "(unnamed)"); - goto err2; - } -@@ -3484,11 +3473,11 @@ void SlaOutputDev::updateFont(GfxState *state) - if (n) { - codeToGID = (int *)gmallocn(n, sizeof(int)); - memcpy(codeToGID, ((GfxCIDFont *)gfxFont)->getCIDToGID(), -- n * sizeof(Gushort)); -+ n * sizeof(unsigned short)); - } - } else { - if (fileName) -- ff = FoFiTrueType::load(fileName->getCString()); -+ ff = FoFiTrueType::load(fileName->c_str()); - else - ff = FoFiTrueType::make(tmpBuf, tmpBufLen); - if (! ff) -@@ -3502,7 +3491,7 @@ void SlaOutputDev::updateFont(GfxState *state) - codeToGID, n, faceIndex))) - { - error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", -- gfxFont->getName() ? gfxFont->getName()->getCString() -+ gfxFont->getName() ? gfxFont->getName()->c_str() - : "(unnamed)"); - goto err2; - } -@@ -3559,7 +3548,7 @@ void SlaOutputDev::updateFont(GfxState *state) - GooString *fileName; - char *tmpBuf; - int tmpBufLen; -- Gushort *codeToGID; -+ unsigned short *codeToGID; - DisplayFontParam *dfp; - double *textMat; - double m11, m12, m21, m22, fontSize; -@@ -3604,7 +3593,7 @@ void SlaOutputDev::updateFont(GfxState *state) - } - if (!dfp) - { -- // error(-1, "Couldn't find a font for '%s'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); -+ // error(-1, "Couldn't find a font for '%s'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); - goto err2; - } - switch (dfp->kind) -@@ -3622,37 +3611,37 @@ void SlaOutputDev::updateFont(GfxState *state) - } - fontsrc = new SplashFontSrc; - if (fileName) -- fontsrc->setFile(fileName, gFalse); -+ fontsrc->setFile(fileName, false); - else -- fontsrc->setBuf(tmpBuf, tmpBufLen, gTrue); -+ fontsrc->setBuf(tmpBuf, tmpBufLen, true); - // load the font file - switch (fontType) - { - case fontType1: - if (!(fontFile = m_fontEngine->loadType1Font( id, fontsrc, ((Gfx8BitFont *)gfxFont)->getEncoding()))) - { -- // error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); -+ // error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); - goto err2; - } - break; - case fontType1C: - if (!(fontFile = m_fontEngine->loadType1CFont( id, fontsrc, ((Gfx8BitFont *)gfxFont)->getEncoding()))) - { -- // error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); -+ // error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); - goto err2; - } - break; - case fontType1COT: - if (!(fontFile = m_fontEngine->loadOpenTypeT1CFont( id, fontsrc, ((Gfx8BitFont *)gfxFont)->getEncoding()))) - { -- // error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); -+ // error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); - goto err2; - } - break; - case fontTrueType: - case fontTrueTypeOT: - if (fileName) -- ff = FoFiTrueType::load(fileName->getCString()); -+ ff = FoFiTrueType::load(fileName->c_str()); - else - ff = FoFiTrueType::make(tmpBuf, tmpBufLen); - if (ff) -@@ -3668,7 +3657,7 @@ void SlaOutputDev::updateFont(GfxState *state) - } - if (!(fontFile = m_fontEngine->loadTrueTypeFont( id, fontsrc, codeToGID, n))) - { -- // error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); -+ // error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); - goto err2; - } - break; -@@ -3676,14 +3665,14 @@ void SlaOutputDev::updateFont(GfxState *state) - case fontCIDType0C: - if (!(fontFile = m_fontEngine->loadCIDFont( id, fontsrc))) - { -- // error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); -+ // error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); - goto err2; - } - break; - case fontCIDType0COT: - if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont( id, fontsrc))) - { -- // error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); -+ // error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); - goto err2; - } - break; -@@ -3696,14 +3685,14 @@ void SlaOutputDev::updateFont(GfxState *state) - n = ((GfxCIDFont *)gfxFont)->getCIDToGIDLen(); - if (n) - { -- codeToGID = (Gushort *)gmallocn(n, sizeof(Gushort)); -- memcpy(codeToGID, ((GfxCIDFont *)gfxFont)->getCIDToGID(), n * sizeof(Gushort)); -+ codeToGID = (unsigned short *)gmallocn(n, sizeof(unsigned short)); -+ memcpy(codeToGID, ((GfxCIDFont *)gfxFont)->getCIDToGID(), n * sizeof(unsigned short)); - } - } - else - { - if (fileName) -- ff = FoFiTrueType::load(fileName->getCString()); -+ ff = FoFiTrueType::load(fileName->c_str()); - else - ff = FoFiTrueType::make(tmpBuf, tmpBufLen); - if (!ff) -@@ -3713,7 +3702,7 @@ void SlaOutputDev::updateFont(GfxState *state) - } - if (!(fontFile = m_fontEngine->loadTrueTypeFont( id, fontsrc, codeToGID, n, faceIndex))) - { -- // error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); -+ // error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); - goto err2; - } - break; -@@ -3775,7 +3764,7 @@ void SlaOutputDev::drawChar(GfxState *state, double x, - qPath.setFillRule(Qt::WindingFill); - for (int i = 0; i < fontPath->getLength(); ++i) - { -- Guchar f; -+ unsigned char f; - fontPath->getPoint(i, &x1, &y1, &f); - if (f & splashPathFirst) - qPath.moveTo(x1,y1); -@@ -3793,8 +3782,7 @@ void SlaOutputDev::drawChar(GfxState *state, double x, - if (f & splashPathLast) - qPath.closeSubpath(); - } -- double *ctm; -- ctm = state->getCTM(); -+ const double *ctm = state->getCTM(); - m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); - double xCoor = m_doc->currentPage()->xOffset(); - double yCoor = m_doc->currentPage()->yOffset(); -@@ -3842,19 +3830,19 @@ void SlaOutputDev::drawChar(GfxState *state, double x, - } - } - --GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, Unicode *u, int uLen) -+bool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, Unicode *u, int uLen) - { - // qDebug() << "beginType3Char"; - GfxFont *gfxFont; - if (!(gfxFont = state->getFont())) -- return gTrue; -+ return true; - if (gfxFont->getType() != fontType3) -- return gTrue; -+ return true; - F3Entry f3e; - f3e.colored = false; - m_F3Stack.push(f3e); - pushGroup(); -- return gFalse; -+ return false; - } - - void SlaOutputDev::endType3Char(GfxState *state) -@@ -3948,7 +3936,7 @@ void SlaOutputDev::endTextObject(GfxState *state) - } - } - --QString SlaOutputDev::getColor(GfxColorSpace *color_space, GfxColor *color, int *shade) -+QString SlaOutputDev::getColor(GfxColorSpace *color_space, const GfxColor *color, int *shade) - { - QString fNam; - QString namPrefix = "FromPDF"; -@@ -3993,7 +3981,7 @@ QString SlaOutputDev::getColor(GfxColorSpace *color_sp - else if (color_space->getMode() == csSeparation) - { - GfxCMYK cmyk; -- QString name = QString(((GfxSeparationColorSpace*)color_space)->getName()->getCString()); -+ QString name = QString(((GfxSeparationColorSpace*)color_space)->getName()->c_str()); - double Cc, Mc, Yc, Kc; - bool isRegistrationColor = (name == "All"); - if (!isRegistrationColor) -@@ -4032,7 +4020,7 @@ QString SlaOutputDev::getColor(GfxColorSpace *color_sp - return fNam; - } - --QString SlaOutputDev::getAnnotationColor(AnnotColor *color) -+QString SlaOutputDev::getAnnotationColor(const AnnotColor *color) - { - QString fNam; - QString namPrefix = "FromPDF"; -@@ -4242,7 +4230,7 @@ void SlaOutputDev::applyMask(PageItem *ite) - } - } - --void SlaOutputDev::pushGroup(QString maskName, GBool forSoftMask, GBool alpha, bool inverted) -+void SlaOutputDev::pushGroup(QString maskName, bool forSoftMask, bool alpha, bool inverted) - { - groupEntry gElements; - gElements.forSoftMask = forSoftMask; -@@ -4252,23 +4240,23 @@ void SlaOutputDev::pushGroup(QString maskName, GBool f - m_groupStack.push(gElements); - } - --QString SlaOutputDev::UnicodeParsedString(GooString *s1) -+QString SlaOutputDev::UnicodeParsedString(const GooString *s1) - { - if ( !s1 || s1->getLength() == 0 ) - return QString(); -- GBool isUnicode; -+ bool isUnicode; - int i; - Unicode u; - QString result; - if ((s1->getChar(0) & 0xff) == 0xfe && (s1->getLength() > 1 && (s1->getChar(1) & 0xff) == 0xff)) - { -- isUnicode = gTrue; -+ isUnicode = true; - i = 2; - result.reserve((s1->getLength() - 2) / 2); - } - else - { -- isUnicode = gFalse; -+ isUnicode = false; - i = 0; - result.reserve(s1->getLength()); - } diff --git a/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.h b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.h deleted file mode 100644 index 7ec2a45fb445..000000000000 --- a/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.h +++ /dev/null @@ -1,248 +0,0 @@ ---- scribus/plugins/import/pdf/slaoutput.h.orig 2019-01-10 06:21:56 UTC -+++ scribus/plugins/import/pdf/slaoutput.h -@@ -26,7 +26,6 @@ for which a new license (GPL+exception) is in place. - #include "selection.h" - #include "vgradient.h" - --#include <poppler/goo/gtypes.h> - #include <poppler/Object.h> - #include <poppler/OutputDev.h> - #include <poppler/Gfx.h> -@@ -61,9 +60,9 @@ class LinkSubmitForm: public LinkAction (public) - // Destructor. - virtual ~LinkSubmitForm(); - // Was the LinkImportData created successfully? -- virtual GBool isOk() { return fileName != NULL; } -+ virtual bool isOk() const { return fileName != NULL; } - // Accessors. -- virtual LinkActionKind getKind() { return actionUnknown; } -+ virtual LinkActionKind getKind() const { return actionUnknown; } - GooString *getFileName() { return fileName; } - int getFlags() { return m_flags; } - private: -@@ -83,9 +82,9 @@ class LinkImportData: public LinkAction (public) - // Destructor. - virtual ~LinkImportData(); - // Was the LinkImportData created successfully? -- virtual GBool isOk() { return fileName != NULL; } -+ virtual bool isOk() const { return fileName != NULL; } - // Accessors. -- virtual LinkActionKind getKind() { return actionUnknown; } -+ virtual LinkActionKind getKind() const { return actionUnknown; } - GooString *getFileName() { return fileName; } - private: - GooString *fileName; // file name -@@ -98,9 +97,9 @@ class SplashOutFontFileID: public SplashFontFileID - { - public: - -- SplashOutFontFileID(Ref *rA) { r = *rA; } -+ SplashOutFontFileID(const Ref *rA) { r = *rA; } - ~SplashOutFontFileID() {} -- GBool matches(SplashFontFileID *id) -+ bool matches(SplashFontFileID *id) - { - return ((SplashOutFontFileID *)id)->r.num == r.num && ((SplashOutFontFileID *)id)->r.gen == r.gen; - } -@@ -115,18 +114,18 @@ class AnoOutputDev : public OutputDev - public: - AnoOutputDev(ScribusDoc* doc, QStringList *importedColors); - virtual ~AnoOutputDev(); -- GBool isOk() { return gTrue; } -- virtual GBool upsideDown() { return gTrue; } -- virtual GBool useDrawChar() { return gFalse; } -- virtual GBool interpretType3Chars() { return gFalse; } -- virtual GBool useTilingPatternFill() { return gFalse; } -- virtual GBool useShadedFills(int type) { return gFalse; } -- virtual GBool useFillColorStop() { return gFalse; } -- virtual GBool useDrawForm() { return gFalse; } -+ bool isOk() { return true; } -+ virtual bool upsideDown() { return true; } -+ virtual bool useDrawChar() { return false; } -+ virtual bool interpretType3Chars() { return false; } -+ virtual bool useTilingPatternFill() { return false; } -+ virtual bool useShadedFills(int type) { return false; } -+ virtual bool useFillColorStop() { return false; } -+ virtual bool useDrawForm() { return false; } - virtual void stroke(GfxState *state); - virtual void eoFill(GfxState *state); - virtual void fill(GfxState *state); -- virtual void drawString(GfxState *state, GooString *s); -+ virtual void drawString(GfxState *state, const GooString *s); - - QString CurrColorText; - QString CurrColorFill; -@@ -135,7 +134,7 @@ class AnoOutputDev : public OutputDev - GooString *m_fontName; - GooString *m_itemText; - private: -- QString getColor(GfxColorSpace *color_space, GfxColor *color, int *shade); -+ QString getColor(GfxColorSpace *color_space, const GfxColor *color, int *shade); - ScribusDoc* m_doc; - QStringList *m_importedColors; - }; -@@ -148,7 +147,7 @@ class SlaOutputDev : public OutputDev (public) - virtual ~SlaOutputDev(); - LinkAction* SC_getAction(AnnotWidget *ano); - LinkAction* SC_getAdditionalAction(const char *key, AnnotWidget *ano); -- static GBool annotations_callback(Annot *annota, void *user_data); -+ static bool annotations_callback(Annot *annota, void *user_data); - bool handleTextAnnot(Annot* annota, double xCoor, double yCoor, double width, double height); - bool handleLinkAnnot(Annot* annota, double xCoor, double yCoor, double width, double height); - bool handleWidgetAnnot(Annot* annota, double xCoor, double yCoor, double width, double height); -@@ -156,15 +155,15 @@ class SlaOutputDev : public OutputDev (public) - void handleActions(PageItem* ite, AnnotWidget *ano); - void startDoc(PDFDoc *doc, XRef *xrefA, Catalog *catA); - -- GBool isOk() { return gTrue; } -- virtual GBool upsideDown() { return gTrue; } -- virtual GBool useDrawChar() { return gTrue; } -- virtual GBool interpretType3Chars() { return gTrue; } -- virtual GBool useTilingPatternFill() { return gTrue; } -- virtual GBool useShadedFills(int type) { return type <= 7; } -- virtual GBool useFillColorStop() { return gTrue; } -- virtual GBool useDrawForm() { return gFalse; } --// virtual GBool needClipToCropBox() { return gTrue; } -+ bool isOk() { return true; } -+ virtual bool upsideDown() { return true; } -+ virtual bool useDrawChar() { return true; } -+ virtual bool interpretType3Chars() { return true; } -+ virtual bool useTilingPatternFill() { return true; } -+ virtual bool useShadedFills(int type) { return type <= 7; } -+ virtual bool useFillColorStop() { return true; } -+ virtual bool useDrawForm() { return false; } -+// virtual bool needClipToCropBox() { return true; } - virtual void startPage(int pageNum, GfxState *, XRef *); - virtual void endPage(); - // graphics state -@@ -175,30 +174,30 @@ class SlaOutputDev : public OutputDev (public) - virtual void stroke(GfxState *state); - virtual void fill(GfxState *state); - virtual void eoFill(GfxState *state); -- GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str, double *pmat, int paintType, int tilingType, Dict *resDict, double *mat, double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep); -- virtual GBool functionShadedFill(GfxState * /*state*/, GfxFunctionShading * /*shading*/) { qDebug() << "Function Shaded Fill"; return gFalse; } -- virtual GBool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax); -- virtual GBool axialShadedSupportExtend(GfxState *state, GfxAxialShading *shading) { return (shading->getExtend0() == shading->getExtend1()); } -- virtual GBool radialShadedFill(GfxState *state, GfxRadialShading *shading, double sMin, double sMax); -- virtual GBool radialShadedSupportExtend(GfxState *state, GfxRadialShading *shading) { return (shading->getExtend0() == shading->getExtend1()); } -- virtual GBool gouraudTriangleShadedFill(GfxState *state, GfxGouraudTriangleShading *shading); -- virtual GBool patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *shading); -+ bool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str, double *pmat, int paintType, int tilingType, Dict *resDict, double *mat, double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep); -+ virtual bool functionShadedFill(GfxState * /*state*/, GfxFunctionShading * /*shading*/) { qDebug() << "Function Shaded Fill"; return false; } -+ virtual bool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax); -+ virtual bool axialShadedSupportExtend(GfxState *state, GfxAxialShading *shading) { return (shading->getExtend0() == shading->getExtend1()); } -+ virtual bool radialShadedFill(GfxState *state, GfxRadialShading *shading, double sMin, double sMax); -+ virtual bool radialShadedSupportExtend(GfxState *state, GfxRadialShading *shading) { return (shading->getExtend0() == shading->getExtend1()); } -+ virtual bool gouraudTriangleShadedFill(GfxState *state, GfxGouraudTriangleShading *shading); -+ virtual bool patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *shading); - //----- path clipping - virtual void clip(GfxState *state); - virtual void eoClip(GfxState *state); - virtual void clipToStrokePath(GfxState * /*state*/) { qDebug() << "Clip to StrokePath"; } -- virtual GBool deviceHasTextClip(GfxState *state) { return gFalse; } -+ virtual bool deviceHasTextClip(GfxState *state) { return false; } - - // If current colorspace is pattern, - // does this device support text in pattern colorspace? -- virtual GBool supportTextCSPattern(GfxState *state) -+ virtual bool supportTextCSPattern(GfxState *state) - { - return state->getFillColorSpace()->getMode() == csPattern; - } - - // If current colorspace is pattern, - // need this device special handling for masks in pattern colorspace? -- virtual GBool fillMaskCSPattern(GfxState * state) -+ virtual bool fillMaskCSPattern(GfxState * state) - { - return state->getFillColorSpace()->getMode() == csPattern; - } -@@ -206,36 +205,36 @@ class SlaOutputDev : public OutputDev (public) - virtual void endMaskClip(GfxState *state) { qDebug() << "End Mask Clip"; } - - //----- grouping operators -- virtual void beginMarkedContent(char *name, Dict *properties); -- virtual void beginMarkedContent(char *name, Object *dictRef); -+ virtual void beginMarkedContent(const char *name, Dict *properties); -+ virtual void beginMarkedContent(const char *name, Object *dictRef); - virtual void endMarkedContent(GfxState *state); -- virtual void markPoint(char *name); -- virtual void markPoint(char *name, Dict *properties); -+ virtual void markPoint(const char *name); -+ virtual void markPoint(const char *name, Dict *properties); - //----- image drawing -- virtual void drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool interpolate, GBool inlineImg); -- virtual void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg); -+ virtual void drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, bool invert, bool interpolate, bool inlineImg); -+ virtual void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, int *maskColors, bool inlineImg); - virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, - int width, int height, - GfxImageColorMap *colorMap, -- GBool interpolate, -+ bool interpolate, - Stream *maskStr, - int maskWidth, int maskHeight, - GfxImageColorMap *maskColorMap, -- GBool maskInterpolate); -+ bool maskInterpolate); - - virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str, - int width, int height, - GfxImageColorMap *colorMap, -- GBool interpolate, -+ bool interpolate, - Stream *maskStr, - int maskWidth, int maskHeight, -- GBool maskInvert, GBool maskInterpolate); // { qDebug() << "Draw Masked Image"; } -+ bool maskInvert, bool maskInterpolate); // { qDebug() << "Draw Masked Image"; } - - //----- transparency groups and soft masks -- virtual void beginTransparencyGroup(GfxState *state, double *bbox, GfxColorSpace * /*blendingColorSpace*/, GBool /*isolated*/, GBool /*knockout*/, GBool /*forSoftMask*/); -+ virtual void beginTransparencyGroup(GfxState *state, double *bbox, GfxColorSpace * /*blendingColorSpace*/, bool /*isolated*/, bool /*knockout*/, bool /*forSoftMask*/); - virtual void paintTransparencyGroup(GfxState *state, double *bbox); - virtual void endTransparencyGroup(GfxState *state); -- virtual void setSoftMask(GfxState * /*state*/, double * /*bbox*/, GBool /*alpha*/, Function * /*transferFunc*/, GfxColor * /*backdropColor*/); -+ virtual void setSoftMask(GfxState * /*state*/, const double * /*bbox*/, bool /*alpha*/, Function * /*transferFunc*/, GfxColor * /*backdropColor*/); - virtual void clearSoftMask(GfxState * /*state*/); - - virtual void updateFillColor(GfxState *state); -@@ -245,7 +244,7 @@ class SlaOutputDev : public OutputDev (public) - virtual void beginTextObject(GfxState *state); - virtual void endTextObject(GfxState *state); - virtual void drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, Unicode * /*u*/, int /*uLen*/); -- virtual GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, Unicode * /*u*/, int /*uLen*/); -+ virtual bool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, Unicode * /*u*/, int /*uLen*/); - virtual void endType3Char(GfxState * /*state*/); - virtual void type3D0(GfxState * /*state*/, double /*wx*/, double /*wy*/); - virtual void type3D1(GfxState * /*state*/, double /*wx*/, double /*wy*/, double /*llx*/, double /*lly*/, double /*urx*/, double /*ury*/); -@@ -260,13 +259,13 @@ class SlaOutputDev : public OutputDev (public) - - private: - void getPenState(GfxState *state); -- QString getColor(GfxColorSpace *color_space, GfxColor *color, int *shade); -- QString getAnnotationColor(AnnotColor *color); -+ QString getColor(GfxColorSpace *color_space, const GfxColor *color, int *shade); -+ QString getAnnotationColor(const AnnotColor *color); - QString convertPath(GfxPath *path); - 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); -+ void pushGroup(QString maskName = "", bool forSoftMask = false, bool alpha = false, bool inverted = false); -+ QString UnicodeParsedString(const GooString *s1); - bool checkClip(); - bool pathIsClosed; - QString CurrColorFill; -@@ -283,9 +282,9 @@ class SlaOutputDev : public OutputDev (public) - struct groupEntry - { - QList<PageItem*> Items; -- GBool forSoftMask; -- GBool isolated; -- GBool alpha; -+ bool forSoftMask; -+ bool isolated; -+ bool alpha; - QString maskName; - bool inverted; - }; diff --git a/print/scribus-devel/files/patch-scribus_third__party_lib2geom_isnan.h b/print/scribus-devel/files/patch-scribus_third__party_lib2geom_isnan.h deleted file mode 100644 index b3a426f18bfc..000000000000 --- a/print/scribus-devel/files/patch-scribus_third__party_lib2geom_isnan.h +++ /dev/null @@ -1,11 +0,0 @@ ---- scribus/third_party/lib2geom/isnan.h.orig 2018-12-25 11:40:59 UTC -+++ scribus/third_party/lib2geom/isnan.h -@@ -33,7 +33,7 @@ - # define is_nan(_a) (__isnan(_a)) /* MacOSX/Darwin definition < 10.4 */ - #elif defined(WIN32) || defined(_isnan) - # define is_nan(_a) (_isnan(_a)) /* Win32 definition */ --#elif defined(isnan) || defined(__FreeBSD__) -+#elif defined(isnan) - # define is_nan(_a) (isnan(_a)) /* GNU definition */ - #else - # define is_nan(_a) (std::isnan(_a)) diff --git a/print/scribus-devel/files/patch-z-gentoo_scribus-1.5.5_pre20190429-poppler-0.76.patch b/print/scribus-devel/files/patch-z-gentoo_scribus-1.5.5_pre20190429-poppler-0.76.patch deleted file mode 100644 index 27b758158355..000000000000 --- a/print/scribus-devel/files/patch-z-gentoo_scribus-1.5.5_pre20190429-poppler-0.76.patch +++ /dev/null @@ -1,51 +0,0 @@ -From aeea6a2ed4cb15ce8c35bb83066ef03e4e04b29b Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Thu, 2 May 2019 00:08:12 +0200 -Subject: [PATCH] Fix build with poppler-0.76 - -findPage(int num, int gen) -> findPage(const Ref ref) - -https://gitlab.freedesktop.org/poppler/poppler/commit/244c7d6926463b079b1f96e34d9e4451d352942e - ---- scribus/plugins/import/pdf/slaoutput.cpp.orig 2019-05-12 09:24:08.096711000 +0200 -+++ scribus/plugins/import/pdf/slaoutput.cpp 2019-05-12 09:24:46.609452000 +0200 -@@ -516,8 +516,7 @@ - { - if (dst->isPageRef()) - { -- Ref dstr = dst->getPageRef(); -- pagNum = pdfDoc->findPage(dstr.num, dstr.gen); -+ pagNum = pdfDoc->findPage(dst->getPageRef()); - } - else - pagNum = dst->getPageNum(); -@@ -538,8 +537,7 @@ - { - if (dstn->isPageRef()) - { -- Ref dstr = dstn->getPageRef(); -- pagNum = pdfDoc->findPage(dstr.num, dstr.gen); -+ pagNum = pdfDoc->findPage(dstn->getPageRef()); - } - else - pagNum = dstn->getPageNum(); -@@ -1061,8 +1059,7 @@ - { - if (dst->isPageRef()) - { -- Ref dstr = dst->getPageRef(); -- pagNum = pdfDoc->findPage(dstr.num, dstr.gen); -+ pagNum = pdfDoc->findPage(dst->getPageRef()); - } - else - pagNum = dst->getPageNum(); -@@ -1085,8 +1082,7 @@ - { - if (dstn->isPageRef()) - { -- Ref dstr = dstn->getPageRef(); -- pagNum = pdfDoc->findPage(dstr.num, dstr.gen); -+ pagNum = pdfDoc->findPage(dstn->getPageRef()); - } - else - pagNum = dstn->getPageNum(); diff --git a/print/scribus-devel/pkg-plist b/print/scribus-devel/pkg-plist index fbea98c63102..a5656d8a6c3c 100644 --- a/print/scribus-devel/pkg-plist +++ b/print/scribus-devel/pkg-plist @@ -526,7 +526,6 @@ share/applications/scribus.desktop %%PORTDOCS%%%%DOCSDIR%%/de/scripterapi-manobj.html %%PORTDOCS%%%%DOCSDIR%%/de/scripterapi-object.html %%PORTDOCS%%%%DOCSDIR%%/de/scripterapi-page.html -%%PORTDOCS%%%%DOCSDIR%%/de/scripterapi-pydoc.html %%PORTDOCS%%%%DOCSDIR%%/de/scripterapi-select.html %%PORTDOCS%%%%DOCSDIR%%/de/scripterapi-setobjprop.html %%PORTDOCS%%%%DOCSDIR%%/de/scripterapi-textframes.html @@ -1667,7 +1666,6 @@ share/pixmaps/scribus.png %%DATADIR%%/dicts/hyph/README_de_1901.txt %%DATADIR%%/dicts/hyph/README_de_DE.txt %%DATADIR%%/dicts/hyph/README_en_EN.txt -%%DATADIR%%/dicts/hyph/README_en_GB.txt %%DATADIR%%/dicts/hyph/README_es_ES.txt %%DATADIR%%/dicts/hyph/README_fi_FI.txt %%DATADIR%%/dicts/hyph/README_hu_HU.txt @@ -2085,7 +2083,6 @@ share/pixmaps/scribus.png %%DATADIR%%/icons/1_5_0/Unlock.xpm %%DATADIR%%/icons/1_5_0/Unter.xpm %%DATADIR%%/icons/1_5_0/Winkel.xpm -%%DATADIR%%/icons/1_5_0/Zeichen.xpm %%DATADIR%%/icons/1_5_0/above.png %%DATADIR%%/icons/1_5_0/acroread16.png %%DATADIR%%/icons/1_5_0/acroread22.png @@ -2546,8 +2543,6 @@ share/pixmaps/scribus.png %%DATADIR%%/icons/1_5_1/Strike.xpm %%DATADIR%%/icons/1_5_1/Tief.xpm %%DATADIR%%/icons/1_5_1/Unter.xpm -%%DATADIR%%/icons/1_5_1/Zeichen.png -%%DATADIR%%/icons/1_5_1/Zeichen.xpm %%DATADIR%%/icons/1_5_1/above.png %%DATADIR%%/icons/1_5_1/acroread16.png %%DATADIR%%/icons/1_5_1/acroread22.png @@ -3023,3 +3018,397 @@ share/pixmaps/scribus.png @dir share/man/de/man1 @dir share/man/man1 @dir share/man/pl/man1 +%%DATADIR%%/icons/1_5_1_dark/22/dialog-warning - Copie.png +%%DATADIR%%/icons/1_5_1_dark/22/dialog-warning.png +%%DATADIR%%/icons/1_5_1_dark/22/distribute-horizontal-center.png +%%DATADIR%%/icons/1_5_1_dark/22/distribute-horizontal-equal.png +%%DATADIR%%/icons/1_5_1_dark/22/distribute-horizontal-left.png +%%DATADIR%%/icons/1_5_1_dark/22/distribute-horizontal-margin.png +%%DATADIR%%/icons/1_5_1_dark/22/distribute-horizontal-page.png +%%DATADIR%%/icons/1_5_1_dark/22/distribute-horizontal-right.png +%%DATADIR%%/icons/1_5_1_dark/22/distribute-horizontal-x.png +%%DATADIR%%/icons/1_5_1_dark/22/distribute-vertical-bottom.png +%%DATADIR%%/icons/1_5_1_dark/22/distribute-vertical-center.png +%%DATADIR%%/icons/1_5_1_dark/22/distribute-vertical-equal.png +%%DATADIR%%/icons/1_5_1_dark/22/distribute-vertical-margin.png +%%DATADIR%%/icons/1_5_1_dark/22/distribute-vertical-page.png +%%DATADIR%%/icons/1_5_1_dark/22/distribute-vertical-top.png +%%DATADIR%%/icons/1_5_1_dark/22/distribute-vertical-y.png +%%DATADIR%%/icons/1_5_1_dark/22/document-new.png +%%DATADIR%%/icons/1_5_1_dark/22/document-open.png +%%DATADIR%%/icons/1_5_1_dark/22/document-print-preview.png +%%DATADIR%%/icons/1_5_1_dark/22/document-print.png +%%DATADIR%%/icons/1_5_1_dark/22/document-properties.png +%%DATADIR%%/icons/1_5_1_dark/22/document-save-as.png +%%DATADIR%%/icons/1_5_1_dark/22/document-save.png +%%DATADIR%%/icons/1_5_1_dark/22/draw-arc.png +%%DATADIR%%/icons/1_5_1_dark/22/draw-calligraphic.png +%%DATADIR%%/icons/1_5_1_dark/22/draw-freehand.png +%%DATADIR%%/icons/1_5_1_dark/22/draw-path.png +%%DATADIR%%/icons/1_5_1_dark/22/draw-polygon.png +%%DATADIR%%/icons/1_5_1_dark/22/draw-rectangle.png +%%DATADIR%%/icons/1_5_1_dark/22/draw-spiral.png +%%DATADIR%%/icons/1_5_1_dark/22/draw-star.png +%%DATADIR%%/icons/1_5_1_dark/22/edit-copy.png +%%DATADIR%%/icons/1_5_1_dark/22/edit-cut.png +%%DATADIR%%/icons/1_5_1_dark/22/edit-delete.png +%%DATADIR%%/icons/1_5_1_dark/22/edit-find-replace.png +%%DATADIR%%/icons/1_5_1_dark/22/edit-paste.png +%%DATADIR%%/icons/1_5_1_dark/22/edit-redo.png +%%DATADIR%%/icons/1_5_1_dark/22/edit-undo.png +%%DATADIR%%/icons/1_5_1_dark/22/exit.png +%%DATADIR%%/icons/1_5_1_dark/22/folder.png +%%DATADIR%%/icons/1_5_1_dark/22/go-bottom.png +%%DATADIR%%/icons/1_5_1_dark/22/go-down.png +%%DATADIR%%/icons/1_5_1_dark/22/go-next.png +%%DATADIR%%/icons/1_5_1_dark/22/go-previous.png +%%DATADIR%%/icons/1_5_1_dark/22/go-top.png +%%DATADIR%%/icons/1_5_1_dark/22/go-up.png +%%DATADIR%%/icons/1_5_1_dark/22/insert-barcode.png +%%DATADIR%%/icons/1_5_1_dark/22/insert-button.png +%%DATADIR%%/icons/1_5_1_dark/22/insert-image.png +%%DATADIR%%/icons/1_5_1_dark/22/insert-latex.png +%%DATADIR%%/icons/1_5_1_dark/22/insert-renderframe.png +%%DATADIR%%/icons/1_5_1_dark/22/insert-table-columns.png +%%DATADIR%%/icons/1_5_1_dark/22/insert-table-rows.png +%%DATADIR%%/icons/1_5_1_dark/22/insert-table.png +%%DATADIR%%/icons/1_5_1_dark/22/insert-text-frame.png +%%DATADIR%%/icons/1_5_1_dark/22/list-box.png +%%DATADIR%%/icons/1_5_1_dark/22/measure.png +%%DATADIR%%/icons/1_5_1_dark/22/merge-table-cells.png +%%DATADIR%%/icons/1_5_1_dark/22/pdf-annotations.png +%%DATADIR%%/icons/1_5_1_dark/22/pointer.png +%%DATADIR%%/icons/1_5_1_dark/22/preflight-verifier.png +%%DATADIR%%/icons/1_5_1_dark/22/radiobutton.png +%%DATADIR%%/icons/1_5_1_dark/22/split-table-cells.png +%%DATADIR%%/icons/1_5_1_dark/22/story-editor.png +%%DATADIR%%/icons/1_5_1_dark/22/swap-left.png +%%DATADIR%%/icons/1_5_1_dark/22/swap-right.png +%%DATADIR%%/icons/1_5_1_dark/22/text-field.png +%%DATADIR%%/icons/1_5_1_dark/22/text-frame-link.png +%%DATADIR%%/icons/1_5_1_dark/22/text-frame-unlink.png +%%DATADIR%%/icons/1_5_1_dark/22/transform-crop-and-resize.png +%%DATADIR%%/icons/1_5_1_dark/22/transform-rotate.png +%%DATADIR%%/icons/1_5_1_dark/22/transform-shear-down.png +%%DATADIR%%/icons/1_5_1_dark/22/transform-shear-left.png +%%DATADIR%%/icons/1_5_1_dark/22/transform-shear-right.png +%%DATADIR%%/icons/1_5_1_dark/22/transform-shear-up.png +%%DATADIR%%/icons/1_5_1_dark/22/zoom-in.png +%%DATADIR%%/icons/1_5_1_dark/22/zoom-original.png +%%DATADIR%%/icons/1_5_1_dark/22/zoom-out.png +%%DATADIR%%/icons/1_5_1_dark/22/zoom.png +%%DATADIR%%/icons/1_5_1_dark/32/insert-renderframe.png +%%DATADIR%%/icons/1_5_1_dark/32/page-3fold.png +%%DATADIR%%/icons/1_5_1_dark/32/page-4fold.png +%%DATADIR%%/icons/1_5_1_dark/32/page-doublesided.png +%%DATADIR%%/icons/1_5_1_dark/32/page-simple.png +%%DATADIR%%/icons/1_5_1_dark/AddNode.png +%%DATADIR%%/icons/1_5_1_dark/AllCaps.png +%%DATADIR%%/icons/1_5_1_dark/AppIcon.png +%%DATADIR%%/icons/1_5_1_dark/AppIcon2.png +%%DATADIR%%/icons/1_5_1_dark/BezierClose.png +%%DATADIR%%/icons/1_5_1_dark/DeleteNode.png +%%DATADIR%%/icons/1_5_1_dark/Editm.xpm +%%DATADIR%%/icons/1_5_1_dark/Editm16.png +%%DATADIR%%/icons/1_5_1_dark/Hoch.xpm +%%DATADIR%%/icons/1_5_1_dark/Kapital.xpm +%%DATADIR%%/icons/1_5_1_dark/MoveAsym.png +%%DATADIR%%/icons/1_5_1_dark/MoveKontrol.png +%%DATADIR%%/icons/1_5_1_dark/MoveNode.png +%%DATADIR%%/icons/1_5_1_dark/MoveSym.png +%%DATADIR%%/icons/1_5_1_dark/NoPrint.png +%%DATADIR%%/icons/1_5_1_dark/PolyCut.png +%%DATADIR%%/icons/1_5_1_dark/Reset1Node.png +%%DATADIR%%/icons/1_5_1_dark/ResetNode.png +%%DATADIR%%/icons/1_5_1_dark/Revers.png +%%DATADIR%%/icons/1_5_1_dark/Stift.xpm +%%DATADIR%%/icons/1_5_1_dark/Stift16.png +%%DATADIR%%/icons/1_5_1_dark/Stift16.xpm +%%DATADIR%%/icons/1_5_1_dark/Strike.xpm +%%DATADIR%%/icons/1_5_1_dark/Tief.xpm +%%DATADIR%%/icons/1_5_1_dark/Unter.xpm +%%DATADIR%%/icons/1_5_1_dark/above.png +%%DATADIR%%/icons/1_5_1_dark/acroread16.png +%%DATADIR%%/icons/1_5_1_dark/acroread22.png +%%DATADIR%%/icons/1_5_1_dark/alert.png +%%DATADIR%%/icons/1_5_1_dark/below.png +%%DATADIR%%/icons/1_5_1_dark/beziertool16.png +%%DATADIR%%/icons/1_5_1_dark/blend_16.png +%%DATADIR%%/icons/1_5_1_dark/chain-closed.png +%%DATADIR%%/icons/1_5_1_dark/chain-open.png +%%DATADIR%%/icons/1_5_1_dark/cmsOff.png +%%DATADIR%%/icons/1_5_1_dark/cmsOn.png +%%DATADIR%%/icons/1_5_1_dark/cmyk.png +%%DATADIR%%/icons/1_5_1_dark/compfile.png +%%DATADIR%%/icons/1_5_1_dark/compfile16.png +%%DATADIR%%/icons/1_5_1_dark/configure.png +%%DATADIR%%/icons/1_5_1_dark/crop.png +%%DATADIR%%/icons/1_5_1_dark/doc.png +%%DATADIR%%/icons/1_5_1_dark/docattributes.png +%%DATADIR%%/icons/1_5_1_dark/docattributes_16.png +%%DATADIR%%/icons/1_5_1_dark/document2.png +%%DATADIR%%/icons/1_5_1_dark/documentinfo.png +%%DATADIR%%/icons/1_5_1_dark/editm.png +%%DATADIR%%/icons/1_5_1_dark/exit.png +%%DATADIR%%/icons/1_5_1_dark/exit22.png +%%DATADIR%%/icons/1_5_1_dark/expand.png +%%DATADIR%%/icons/1_5_1_dark/find.png +%%DATADIR%%/icons/1_5_1_dark/find16.png +%%DATADIR%%/icons/1_5_1_dark/firstline.png +%%DATADIR%%/icons/1_5_1_dark/flow-bounding.png +%%DATADIR%%/icons/1_5_1_dark/flow-contour.png +%%DATADIR%%/icons/1_5_1_dark/flow-frame.png +%%DATADIR%%/icons/1_5_1_dark/flow-none.png +%%DATADIR%%/icons/1_5_1_dark/folder.png +%%DATADIR%%/icons/1_5_1_dark/font_otf16.png +%%DATADIR%%/icons/1_5_1_dark/font_subst16.png +%%DATADIR%%/icons/1_5_1_dark/font_truetype16.png +%%DATADIR%%/icons/1_5_1_dark/font_type1_16.png +%%DATADIR%%/icons/1_5_1_dark/framenoresize.png +%%DATADIR%%/icons/1_5_1_dark/frameresize.png +%%DATADIR%%/icons/1_5_1_dark/gear_16.png +%%DATADIR%%/icons/1_5_1_dark/goto.png +%%DATADIR%%/icons/1_5_1_dark/goto16.png +%%DATADIR%%/icons/1_5_1_dark/group.png +%%DATADIR%%/icons/1_5_1_dark/guides.png +%%DATADIR%%/icons/1_5_1_dark/hmirror.png +%%DATADIR%%/icons/1_5_1_dark/hoch.png +%%DATADIR%%/icons/1_5_1_dark/kapital.png +%%DATADIR%%/icons/1_5_1_dark/layer-outline.png +%%DATADIR%%/icons/1_5_1_dark/leftindent.png +%%DATADIR%%/icons/1_5_1_dark/linespacing2.png +%%DATADIR%%/icons/1_5_1_dark/lupe.png +%%DATADIR%%/icons/1_5_1_dark/lupez.png +%%DATADIR%%/icons/1_5_1_dark/lupezm.png +%%DATADIR%%/icons/1_5_1_dark/misc_16.png +%%DATADIR%%/icons/1_5_1_dark/mover.png +%%DATADIR%%/icons/1_5_1_dark/noicon.png +%%DATADIR%%/icons/1_5_1_dark/noicon.xpm +%%DATADIR%%/icons/1_5_1_dark/ok.png +%%DATADIR%%/icons/1_5_1_dark/ok22.png +%%DATADIR%%/icons/1_5_1_dark/ooo_draw.png +%%DATADIR%%/icons/1_5_1_dark/ooo_writer.png +%%DATADIR%%/icons/1_5_1_dark/outlined.png +%%DATADIR%%/icons/1_5_1_dark/pathexclusion.png +%%DATADIR%%/icons/1_5_1_dark/pathintersection.png +%%DATADIR%%/icons/1_5_1_dark/pathparts.png +%%DATADIR%%/icons/1_5_1_dark/pathsubtraction.png +%%DATADIR%%/icons/1_5_1_dark/pathunite.png +%%DATADIR%%/icons/1_5_1_dark/pdf.png +%%DATADIR%%/icons/1_5_1_dark/penciladd.png +%%DATADIR%%/icons/1_5_1_dark/pencilsub.png +%%DATADIR%%/icons/1_5_1_dark/plugins_16.png +%%DATADIR%%/icons/1_5_1_dark/postscript.png +%%DATADIR%%/icons/1_5_1_dark/previewOff.png +%%DATADIR%%/icons/1_5_1_dark/previewOn.png +%%DATADIR%%/icons/1_5_1_dark/python_16.png +%%DATADIR%%/icons/1_5_1_dark/reload.png +%%DATADIR%%/icons/1_5_1_dark/reload16.png +%%DATADIR%%/icons/1_5_1_dark/revert.png +%%DATADIR%%/icons/1_5_1_dark/rgb.png +%%DATADIR%%/icons/1_5_1_dark/rightindent.png +%%DATADIR%%/icons/1_5_1_dark/rotate_ccw.png +%%DATADIR%%/icons/1_5_1_dark/rotate_cw.png +%%DATADIR%%/icons/1_5_1_dark/scrap_16.png +%%DATADIR%%/icons/1_5_1_dark/scribus.png +%%DATADIR%%/icons/1_5_1_dark/scribus16.png +%%DATADIR%%/icons/1_5_1_dark/scribus_logo.png +%%DATADIR%%/icons/1_5_1_dark/scribus_splash.png +%%DATADIR%%/icons/1_5_1_dark/scribusdoc16.png +%%DATADIR%%/icons/1_5_1_dark/shade.png +%%DATADIR%%/icons/1_5_1_dark/shadow.png +%%DATADIR%%/icons/1_5_1_dark/shortwords_16.png +%%DATADIR%%/icons/1_5_1_dark/signature_16.png +%%DATADIR%%/icons/1_5_1_dark/spacewidth.png +%%DATADIR%%/icons/1_5_1_dark/spline.png +%%DATADIR%%/icons/1_5_1_dark/spline16.png +%%DATADIR%%/icons/1_5_1_dark/stift.png +%%DATADIR%%/icons/1_5_1_dark/strike.png +%%DATADIR%%/icons/1_5_1_dark/stylesheet/down_arrow.png +%%DATADIR%%/icons/1_5_1_dark/tabtocindex_16.png +%%DATADIR%%/icons/1_5_1_dark/textbase.png +%%DATADIR%%/icons/1_5_1_dark/textkern.png +%%DATADIR%%/icons/1_5_1_dark/textscaleh.png +%%DATADIR%%/icons/1_5_1_dark/textscalev.png +%%DATADIR%%/icons/1_5_1_dark/tief.png +%%DATADIR%%/icons/1_5_1_dark/tools_16.png +%%DATADIR%%/icons/1_5_1_dark/transform-crop-and-resize.png +%%DATADIR%%/icons/1_5_1_dark/trashcan.png +%%DATADIR%%/icons/1_5_1_dark/trashcan2.png +%%DATADIR%%/icons/1_5_1_dark/txt.png +%%DATADIR%%/icons/1_5_1_dark/u_group.png +%%DATADIR%%/icons/1_5_1_dark/ungroup.png +%%DATADIR%%/icons/1_5_1_dark/unter.png +%%DATADIR%%/icons/1_5_1_dark/vectorgfx.png +%%DATADIR%%/icons/1_5_1_dark/view.png +%%DATADIR%%/icons/1_5_1_dark/viewmagin.png +%%DATADIR%%/icons/1_5_1_dark/viewmagout.png +%%DATADIR%%/icons/1_5_1_dark/vmirror.png +%%DATADIR%%/icons/1_5_1_dark/wizard.png +%%DATADIR%%/icons/1_5_1_dark/wizard16.png +%%DATADIR%%/icons/1_5_1_dark/wordsOnly.png +%%DATADIR%%/icons/1_5_1_dark/zeichen.png +%%DATADIR%%/icons/1_5_1_dark/zeichen.xpm +%%DATADIR%%/loremipsum/hr.xml +%%DATADIR%%/profiles/ISOcoated_v2_300_bas.icc +%%DATADIR%%/profiles/ISOcoated_v2_300_bas.txt +%%DATADIR%%/profiles/sRGB_icc22.icm +%%DATADIR%%/profiles/sRGB_icc22.txt +%%PORTDOCS%%%%DOCSDIR%%/de/scripterapi-styles.html +%%PORTDOCS%%%%DOCSDIR%%/en/scripterapi-styles.html +%%PORTDOCS%%%%DOCSDIR%%/it/scripterapi-styles.html +%%DATADIR%%/dicts/hyph/README_hyph_en_GB.txt +%%DATADIR%%/dicts/hyph/README_hyph_en_US.txt +%%DATADIR%%/dicts/hyph/README_hyph_fr.txt +%%DATADIR%%/dicts/hyph/hyph_en_US.dic +%%DATADIR%%/icons/1_5_0/zeichen.xpm +%%DATADIR%%/icons/1_5_1/zeichen.png +%%DATADIR%%/icons/1_5_1/zeichen.xpm +%%DATADIR%%/icons/1_5_1_dark.xml +%%DATADIR%%/icons/1_5_1_dark/16/accessories-text-editor.png +%%DATADIR%%/icons/1_5_1_dark/16/annot3d.png +%%DATADIR%%/icons/1_5_1_dark/16/checkbox.png +%%DATADIR%%/icons/1_5_1_dark/16/close.png +%%DATADIR%%/icons/1_5_1_dark/16/color-fill.png +%%DATADIR%%/icons/1_5_1_dark/16/color-picker.png +%%DATADIR%%/icons/1_5_1_dark/16/color-stroke.png +%%DATADIR%%/icons/1_5_1_dark/16/combobox.png +%%DATADIR%%/icons/1_5_1_dark/16/configure.png +%%DATADIR%%/icons/1_5_1_dark/16/delete-table-columns.png +%%DATADIR%%/icons/1_5_1_dark/16/delete-table-rows.png +%%DATADIR%%/icons/1_5_1_dark/16/document-new.png +%%DATADIR%%/icons/1_5_1_dark/16/document-open.png +%%DATADIR%%/icons/1_5_1_dark/16/document-print-preview.png +%%DATADIR%%/icons/1_5_1_dark/16/document-print.png +%%DATADIR%%/icons/1_5_1_dark/16/document-properties.png +%%DATADIR%%/icons/1_5_1_dark/16/document-save-as.png +%%DATADIR%%/icons/1_5_1_dark/16/document-save.png +%%DATADIR%%/icons/1_5_1_dark/16/draw-arc.png +%%DATADIR%%/icons/1_5_1_dark/16/draw-arrow-back.png +%%DATADIR%%/icons/1_5_1_dark/16/draw-arrow-down.png +%%DATADIR%%/icons/1_5_1_dark/16/draw-arrow-forward.png +%%DATADIR%%/icons/1_5_1_dark/16/draw-arrow-up.png +%%DATADIR%%/icons/1_5_1_dark/16/draw-bezier-curves.png +%%DATADIR%%/icons/1_5_1_dark/16/draw-calligraphic.png +%%DATADIR%%/icons/1_5_1_dark/16/draw-cross.png +%%DATADIR%%/icons/1_5_1_dark/16/draw-donut.png +%%DATADIR%%/icons/1_5_1_dark/16/draw-ellipse.png +%%DATADIR%%/icons/1_5_1_dark/16/draw-freehand.png +%%DATADIR%%/icons/1_5_1_dark/16/draw-halfcircle1.png +%%DATADIR%%/icons/1_5_1_dark/16/draw-halfcircle2.png +%%DATADIR%%/icons/1_5_1_dark/16/draw-halfcircle3.png +%%DATADIR%%/icons/1_5_1_dark/16/draw-halfcircle4.png +%%DATADIR%%/icons/1_5_1_dark/16/draw-path.png +%%DATADIR%%/icons/1_5_1_dark/16/draw-polygon.png +%%DATADIR%%/icons/1_5_1_dark/16/draw-polyline.png +%%DATADIR%%/icons/1_5_1_dark/16/draw-rectangle.png +%%DATADIR%%/icons/1_5_1_dark/16/draw-spiral.png +%%DATADIR%%/icons/1_5_1_dark/16/draw-square-inverted-corners.png +%%DATADIR%%/icons/1_5_1_dark/16/draw-star.png +%%DATADIR%%/icons/1_5_1_dark/16/draw-text.png +%%DATADIR%%/icons/1_5_1_dark/16/draw-triangle.png +%%DATADIR%%/icons/1_5_1_dark/16/draw-triangle1.png +%%DATADIR%%/icons/1_5_1_dark/16/draw-triangle2.png +%%DATADIR%%/icons/1_5_1_dark/16/draw-triangle3.png +%%DATADIR%%/icons/1_5_1_dark/16/draw-triangle4.png +%%DATADIR%%/icons/1_5_1_dark/16/edit-clear.png +%%DATADIR%%/icons/1_5_1_dark/16/edit-copy.png +%%DATADIR%%/icons/1_5_1_dark/16/edit-cut.png +%%DATADIR%%/icons/1_5_1_dark/16/edit-delete.png +%%DATADIR%%/icons/1_5_1_dark/16/edit-find-replace.png +%%DATADIR%%/icons/1_5_1_dark/16/edit-guides.png +%%DATADIR%%/icons/1_5_1_dark/16/edit-paste.png +%%DATADIR%%/icons/1_5_1_dark/16/edit-redo.png +%%DATADIR%%/icons/1_5_1_dark/16/edit-select-all.png +%%DATADIR%%/icons/1_5_1_dark/16/edit-undo.png +%%DATADIR%%/icons/1_5_1_dark/16/editdoc.png +%%DATADIR%%/icons/1_5_1_dark/16/exit.png +%%DATADIR%%/icons/1_5_1_dark/16/flip-object-horizontal.png +%%DATADIR%%/icons/1_5_1_dark/16/flip-object-vertical.png +%%DATADIR%%/icons/1_5_1_dark/16/folder.png +%%DATADIR%%/icons/1_5_1_dark/16/format-justify-center.png +%%DATADIR%%/icons/1_5_1_dark/16/format-justify-fill-block-right.png +%%DATADIR%%/icons/1_5_1_dark/16/format-justify-fill-block.png +%%DATADIR%%/icons/1_5_1_dark/16/format-justify-fill.png +%%DATADIR%%/icons/1_5_1_dark/16/format-justify-left.png +%%DATADIR%%/icons/1_5_1_dark/16/format-justify-right.png +%%DATADIR%%/icons/1_5_1_dark/16/go-bottom.png +%%DATADIR%%/icons/1_5_1_dark/16/go-down.png +%%DATADIR%%/icons/1_5_1_dark/16/go-first.png +%%DATADIR%%/icons/1_5_1_dark/16/go-home.png +%%DATADIR%%/icons/1_5_1_dark/16/go-last.png +%%DATADIR%%/icons/1_5_1_dark/16/go-next.png +%%DATADIR%%/icons/1_5_1_dark/16/go-previous.png +%%DATADIR%%/icons/1_5_1_dark/16/go-top.png +%%DATADIR%%/icons/1_5_1_dark/16/go-up.png +%%DATADIR%%/icons/1_5_1_dark/16/help-browser.png +%%DATADIR%%/icons/1_5_1_dark/16/image-x-generic.png +%%DATADIR%%/icons/1_5_1_dark/16/information.png +%%DATADIR%%/icons/1_5_1_dark/16/insert-barcode.png +%%DATADIR%%/icons/1_5_1_dark/16/insert-button.png +%%DATADIR%%/icons/1_5_1_dark/16/insert-image.png +%%DATADIR%%/icons/1_5_1_dark/16/insert-renderframe.png +%%DATADIR%%/icons/1_5_1_dark/16/insert-table-columns.png +%%DATADIR%%/icons/1_5_1_dark/16/insert-table-rows.png +%%DATADIR%%/icons/1_5_1_dark/16/insert-table.png +%%DATADIR%%/icons/1_5_1_dark/16/insert-text-frame.png +%%DATADIR%%/icons/1_5_1_dark/16/layer-flow-around.png +%%DATADIR%%/icons/1_5_1_dark/16/list-add.png +%%DATADIR%%/icons/1_5_1_dark/16/list-box.png +%%DATADIR%%/icons/1_5_1_dark/16/list-remove.png +%%DATADIR%%/icons/1_5_1_dark/16/lock-unlocked.png +%%DATADIR%%/icons/1_5_1_dark/16/lock.png +%%DATADIR%%/icons/1_5_1_dark/16/measure.png +%%DATADIR%%/icons/1_5_1_dark/16/merge-table-cells.png +%%DATADIR%%/icons/1_5_1_dark/16/page-3fold.png +%%DATADIR%%/icons/1_5_1_dark/16/page-4fold.png +%%DATADIR%%/icons/1_5_1_dark/16/page-doublesided.png +%%DATADIR%%/icons/1_5_1_dark/16/page-simple.png +%%DATADIR%%/icons/1_5_1_dark/16/pdf-annotations.png +%%DATADIR%%/icons/1_5_1_dark/16/pointer.png +%%DATADIR%%/icons/1_5_1_dark/16/preferences-desktop-font.png +%%DATADIR%%/icons/1_5_1_dark/16/preferences-desktop-keyboard-shortcuts.png +%%DATADIR%%/icons/1_5_1_dark/16/preflight-verifier.png +%%DATADIR%%/icons/1_5_1_dark/16/printer.png +%%DATADIR%%/icons/1_5_1_dark/16/radiobutton.png +%%DATADIR%%/icons/1_5_1_dark/16/scale.png +%%DATADIR%%/icons/1_5_1_dark/16/show-object.png +%%DATADIR%%/icons/1_5_1_dark/16/split-table-cells.png +%%DATADIR%%/icons/1_5_1_dark/16/story-editor.png +%%DATADIR%%/icons/1_5_1_dark/16/stroke-cap-butt.png +%%DATADIR%%/icons/1_5_1_dark/16/stroke-cap-round.png +%%DATADIR%%/icons/1_5_1_dark/16/stroke-cap-square.png +%%DATADIR%%/icons/1_5_1_dark/16/stroke-join-bevel.png +%%DATADIR%%/icons/1_5_1_dark/16/stroke-join-miter.png +%%DATADIR%%/icons/1_5_1_dark/16/stroke-join-round.png +%%DATADIR%%/icons/1_5_1_dark/16/system-file-manager.png +%%DATADIR%%/icons/1_5_1_dark/16/text-direction-ltr.png +%%DATADIR%%/icons/1_5_1_dark/16/text-direction-rtl.png +%%DATADIR%%/icons/1_5_1_dark/16/text-field.png +%%DATADIR%%/icons/1_5_1_dark/16/text-frame-link.png +%%DATADIR%%/icons/1_5_1_dark/16/text-frame-unlink.png +%%DATADIR%%/icons/1_5_1_dark/16/transform-rotate.png +%%DATADIR%%/icons/1_5_1_dark/16/video-display.png +%%DATADIR%%/icons/1_5_1_dark/16/zoom-in.png +%%DATADIR%%/icons/1_5_1_dark/16/zoom-original.png +%%DATADIR%%/icons/1_5_1_dark/16/zoom-out.png +%%DATADIR%%/icons/1_5_1_dark/16/zoom.png +%%DATADIR%%/icons/1_5_1_dark/22/align-horizontal-center.png +%%DATADIR%%/icons/1_5_1_dark/22/align-horizontal-left-out.png +%%DATADIR%%/icons/1_5_1_dark/22/align-horizontal-left.png +%%DATADIR%%/icons/1_5_1_dark/22/align-horizontal-right-out.png +%%DATADIR%%/icons/1_5_1_dark/22/align-horizontal-right.png +%%DATADIR%%/icons/1_5_1_dark/22/align-vertical-bottom-out.png +%%DATADIR%%/icons/1_5_1_dark/22/align-vertical-bottom.png +%%DATADIR%%/icons/1_5_1_dark/22/align-vertical-center.png +%%DATADIR%%/icons/1_5_1_dark/22/align-vertical-top-out.png +%%DATADIR%%/icons/1_5_1_dark/22/align-vertical-top.png +%%DATADIR%%/icons/1_5_1_dark/22/annot3d.png +%%DATADIR%%/icons/1_5_1_dark/22/checkbox.png +%%DATADIR%%/icons/1_5_1_dark/22/close.png +%%DATADIR%%/icons/1_5_1_dark/22/color-picker.png +%%DATADIR%%/icons/1_5_1_dark/22/combobox.png +%%DATADIR%%/icons/1_5_1_dark/22/delete-table-columns.png +%%DATADIR%%/icons/1_5_1_dark/22/delete-table-rows.png +%%DATADIR%%/icons/1_5_1_dark/22/dialog-error.png +%%DATADIR%%/scripts/Align_image_in_frame.py |