View Issue Details

IDProjectCategoryView StatusLast Update
0015666ScribusInternalpublic2019-06-04 20:55
Reporterale Assigned Tojghali  
PrioritynormalSeverityminorReproducibilityhave not tried
Status closedResolutionfixed 
Product Version1.5.5.svn 
Target VersionFixed in Version1.5.5.svn 
Summary0015666: Fix build with poppler-0.76
DescriptionfindPage(int num, int gen) -> findPage(const Ref ref)

https://gitlab.freedesktop.org/poppler/poppler/commit/244c7d6926463b079b1f96e34d9e4451d352942e

Please note that this is just a quick fix to see if scribus builds after the changes (it does). It is not backwards compatible.

diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
index fe9794a659..b25082de6c 100644
--- a/scribus/plugins/import/pdf/slaoutput.cpp
+++ b/scribus/plugins/import/pdf/slaoutput.cpp
@@ -429,8 +429,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
             {
                 if (dst->isPageRef())
                 {
- Ref dstr = dst->getPageRef();
- pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
+ pagNum = pdfDoc->findPage(dst->getPageRef());
                 }
                 else
                     pagNum = dst->getPageNum();
@@ -451,8 +450,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
                     {
                         if (dstn->isPageRef())
                         {
- Ref dstr = dstn->getPageRef();
- pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
+ pagNum = pdfDoc->findPage(dstn->getPageRef());
                         }
                         else
                             pagNum = dstn->getPageNum();
@@ -931,8 +929,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
                 {
                     if (dst->isPageRef())
                     {
- Ref dstr = dst->getPageRef();
- pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
+ pagNum = pdfDoc->findPage(dst->getPageRef());
                     }
                     else
                         pagNum = dst->getPageNum();
@@ -955,8 +952,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
                         {
                             if (dstn->isPageRef())
                             {
- Ref dstr = dstn->getPageRef();
- pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
+ pagNum = pdfDoc->findPage(dstn->getPageRef());
                             }
                             else
                                 pagNum = dstn->getPageNum();
TagsNo tags attached.
PatchNo

Issue History

Date Modified Username Field Change
2019-05-02 13:44 ale New Issue
2019-05-02 13:45 ale Note Added: 0046172
2019-05-02 13:55 jghali Category - => Internal
2019-05-02 16:45 jghali Assigned To => jghali
2019-05-02 16:45 jghali Status new => resolved
2019-05-02 16:45 jghali Resolution open => fixed
2019-05-02 16:45 jghali Fixed in Version => 1.5.5.svn
2019-06-04 20:55 cbradney Status resolved => closed