Author: jghali
Date: Thu Feb 3 19:46:13 2022
New Revision: 24885
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24885
Log:
Small update vs latest code in poppler
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=24885&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 Feb 3
19:46:13 2022
@@ -3072,10 +3072,10 @@
delete id;
else
{
- if (!(fontLoc = gfxFont->locateFont(xref, nullptr)))
- {
- error(errSyntaxError, -1, "Couldn't find a font for
'{0:s}'",
- gfxFont->getName() ? gfxFont->getName()->getCString() :
"(unnamed)");
+ 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)");
goto err2;
}
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
