From f75c1613db67f4067643d0218a2db3235e42ec9f Mon Sep 17 00:00:00 2001
From: Jean Ghali <jghali@libertysurf.fr>
Date: Thu, 3 Feb 2022 19:46:13 +0000
Subject: [PATCH] Small update vs latest code in poppler

git-svn-id: svn://scribus.net/trunk/Scribus@24885 11d20701-8431-0410-a711-e3c959e3b870
---
 scribus/plugins/import/pdf/slaoutput.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
index 3650c96f52..a6f4e00fa9 100644
--- a/scribus/plugins/import/pdf/slaoutput.cpp
+++ b/scribus/plugins/import/pdf/slaoutput.cpp
@@ -3072,10 +3072,10 @@ void SlaOutputDev::updateFont(GfxState *state)
 		delete id;
 	else
 	{
-		if (!(fontLoc = gfxFont->locateFont(xref, nullptr)))
+		fontLoc = gfxFont->locateFont((xref) ? xref : pdfDoc->getXRef(), nullptr);
+		if (!fontLoc)
 		{
-			error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'",
-			gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+			error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
 			goto err2;
 		}
 
'active' href='/guix/log/gnu/packages/aux-files/run-in-namespace.c'>log</a><a href='/guix/tree/gnu/packages/aux-files/run-in-namespace.c?id=d3b010c38c449ea17bf7beba48de39acec26ae04'>tree</a><a href='/guix/commit/gnu/packages/aux-files/run-in-namespace.c?id=d3b010c38c449ea17bf7beba48de39acec26ae04'>commit</a><a href='/guix/diff/gnu/packages/aux-files/run-in-namespace.c?id=d3b010c38c449ea17bf7beba48de39acec26ae04'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/aux-files/run-in-namespace.c'>
<input type='hidden' name='id' value='d3b010c38c449ea17bf7beba48de39acec26ae04'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=d3b010c38c449ea17bf7beba48de39acec26ae04'>root</a>/<a href='/guix/log/gnu?id=d3b010c38c449ea17bf7beba48de39acec26ae04'>gnu</a>/<a href='/guix/log/gnu/packages?id=d3b010c38c449ea17bf7beba48de39acec26ae04'>packages</a>/<a href='/guix/log/gnu/packages/aux-files?id=d3b010c38c449ea17bf7beba48de39acec26ae04'>aux-files</a>/<a href='/guix/log/gnu/packages/aux-files/run-in-namespace.c?id=d3b010c38c449ea17bf7beba48de39acec26ae04'>run-in-namespace.c</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/aux-files/run-in-namespace.c?id=d3b010c38c449ea17bf7beba48de39acec26ae04&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-09-09 17:17:56 +0200'>2024-09-09</span></td><td><a href='/guix/commit/gnu/packages/aux-files/run-in-namespace.c?id=cdb31a8869d9faf6baf561836e99d7b6953aebe3'>pack: Add terminating zero after ‘readlink’ call.</a><span class='msg-avail'>...<span class='msg-tooltip'>The bug had been there from the start (commit
47a60325ca650e8fc1a291c8655b4297f4de8deb) but only with the switch to
glibc 2.39 did we actually hit it.

* gnu/packages/aux-files/run-in-namespace.c (main): Add terminating zero
on SELF.

Change-Id: If0488f5ca0964d8d7b1666039a7f8bdf7abce111
</span></span></td><td>Ludovic Courtès</td></tr>