r24181 by jghali - Rename SplashOutFontFileID class defined in PDF importer in order to avoid symbols conflict with poppler internal class when poppler is compiled as static libs

[scribus-commit]

Author: jghali
Date: Thu Nov  5 16:47:30 2020
New Revision: 24181

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24181
Log:
Rename SplashOutFontFileID class defined in PDF importer in order to avoid symbols conflict with poppler internal class when poppler is compiled as static libs

Modified:
    trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
    trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h

Modified: trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24181&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 Nov  5 16:47:30 2020
@@ -3021,7 +3021,7 @@
 	GfxFont *gfxFont;
 	GfxFontLoc *fontLoc;
 	GfxFontType fontType;
-	SplashOutFontFileID *id;
+	SlaOutFontFileID *id;
 	SplashFontFile *fontFile;
 	SplashFontSrc *fontsrc = nullptr;
 	FoFiTrueType *ff;
@@ -3051,7 +3051,7 @@
 	}
 
 	// check the font file cache
-	id = new SplashOutFontFileID(gfxFont->getID());
+	id = new SlaOutFontFileID(gfxFont->getID());
 	if ((fontFile = m_fontEngine->getFontFile(id)))
 		delete id;
 	else

Modified: trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24181&path=/trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h	(original)
+++ trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h	Thu Nov  5 16:47:30 2020
@@ -100,19 +100,20 @@
 private:
 	GooString *fileName {nullptr};		// file name
 };
-//------------------------------------------------------------------------
-// SplashOutFontFileID
-//------------------------------------------------------------------------
-
-class SplashOutFontFileID: public SplashFontFileID
-{
-public:
-
-	SplashOutFontFileID(const Ref *rA) { r = *rA; }
-	~SplashOutFontFileID() {}
+
+//------------------------------------------------------------------------
+// SlaOutFontFileID
+//------------------------------------------------------------------------
+
+class SlaOutFontFileID: public SplashFontFileID
+{
+public:
+	SlaOutFontFileID(const Ref *rA) { r = *rA; }
+	~SlaOutFontFileID() {}
+
 	GBool matches(SplashFontFileID *id)
 	{
-		return ((SplashOutFontFileID *)id)->r.num == r.num && ((SplashOutFontFileID *)id)->r.gen == r.gen;
+		return ((SlaOutFontFileID*) id)->r.num == r.num && ((SlaOutFontFileID *) id)->r.gen == r.gen;
 	}
 
 private: