Author: jghali
Date: Thu May 2 16:45:02 2019
New Revision: 22975
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22975
Log:
#15666: Fix build with poppler 0.76
Modified:
trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
Modified: trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22975&path=/trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp Thu May 2
16:45:02 2019
@@ -430,7 +430,11 @@
if (dst->isPageRef())
{
Ref dstr = dst->getPageRef();
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 76, 0)
+ pagNum = pdfDoc->findPage(dstr);
+#else
pagNum = pdfDoc->findPage(dstr.num,
dstr.gen);
+#endif
}
else
pagNum = dst->getPageNum();
@@ -452,7 +456,11 @@
if (dstn->isPageRef())
{
Ref dstr =
dstn->getPageRef();
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 76, 0)
+ pagNum =
pdfDoc->findPage(dstr);
+#else
pagNum =
pdfDoc->findPage(dstr.num, dstr.gen);
+#endif
}
else
pagNum =
dstn->getPageNum();
@@ -932,7 +940,11 @@
if (dst->isPageRef())
{
Ref dstr = dst->getPageRef();
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 76, 0)
+ pagNum = pdfDoc->findPage(dstr);
+#else
pagNum =
pdfDoc->findPage(dstr.num, dstr.gen);
+#endif
}
else
pagNum = dst->getPageNum();
@@ -956,7 +968,11 @@
if (dstn->isPageRef())
{
Ref dstr =
dstn->getPageRef();
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 76, 0)
+ pagNum =
pdfDoc->findPage(dstr);
+#else
pagNum =
pdfDoc->findPage(dstr.num, dstr.gen);
+#endif
}
else
pagNum =
dstn->getPageNum();
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
