Репозитории ALT
S: | 1.5.8-alt2 |
5.1: | 1.3.5.1-alt4.M50P.1 |
4.1: | 1.3.4-alt5 |
4.0: | 1.3.4-alt3.M40.1 |
3.0: | 1.2.2-alt1.cvs20050405 |
+backports: | 1.3.3.7-alt0.M30.1 |
Группа :: Издательство
Пакет: scribus
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: poppler-22.03.0.patch
Скачать
Скачать
diff -upr scribus-1.5.8.orig/scribus/plugins/import/pdf/importpdf.cpp scribus-1.5.8/scribus/plugins/import/pdf/importpdf.cpp
--- scribus-1.5.8.orig/scribus/plugins/import/pdf/importpdf.cpp 2022-01-23 18:16:01.000000000 +0200
+++ scribus-1.5.8/scribus/plugins/import/pdf/importpdf.cpp 2022-03-02 14:03:29.851352471 +0200
@@ -90,7 +90,11 @@ QImage PdfPlug::readThumbnail(const QStr
#endif
globalParams->setErrQuiet(gTrue);
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0)
+ PDFDoc pdfDoc{std::make_unique<GooString>(fname)};
+#else
PDFDoc pdfDoc{fname, nullptr, nullptr, nullptr};
+#endif
if (!pdfDoc.isOk() || pdfDoc.getErrorCode() == errEncrypted)
return QImage();
@@ -343,7 +347,11 @@ bool PdfPlug::convert(const QString& fn)
globalParams->setErrQuiet(gTrue);
// globalParams->setPrintCommands(gTrue);
QList<OptionalContentGroup*> ocgGroups;
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0)
+ auto pdfDoc = std::unique_ptr<PDFDoc>(new PDFDoc(std::make_unique<GooString>(fname)));
+#else
auto pdfDoc = std::unique_ptr<PDFDoc>(new PDFDoc(fname, nullptr, nullptr, nullptr));
+#endif
if (pdfDoc)
{
if (pdfDoc->getErrorCode() == errEncrypted)
@@ -363,7 +371,11 @@ bool PdfPlug::convert(const QString& fn)
auto fname = new GooString(QFile::encodeName(fn).data());
#endif
auto userPW = new GooString(text.toLocal8Bit().data());
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0)
+ pdfDoc.reset(new PDFDoc(std::make_unique<GooString>(fname), GooString(userPW), GooString(userPW)));
+#else
pdfDoc.reset(new PDFDoc(fname, userPW, userPW, nullptr));
+#endif
qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
}
if ((!pdfDoc) || (pdfDoc->getErrorCode() != errNone))