1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
|
Description: Small update vs latest code in poppler
Origin: upstream, https://www.scribus.net/websvn/revision.php?repname=Scribus&rev=24886
Index: scribus/plugins/import/pdf/slaoutput.cpp
===================================================================
--- a/scribus/plugins/import/pdf/slaoutput.cpp (revision 24885)
+++ b/scribus/plugins/import/pdf/slaoutput.cpp (revision 24886)
@@ -3072,10 +3072,10 @@
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;
}
|
