r19595 by jghali - #12778, patch 5/17: fix a series of warnings from clang

scribus-commit scribus-commit at lists.scribus.net
Fri Oct 17 22:53:22 UTC 2014


Author: jghali
Date: Fri Oct 17 22:53:22 2014
New Revision: 19595

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19595
Log:
#12778, patch 5/17: fix a series of warnings from clang
This fix signature of SlaOutputDev::startPage(). The signature change was already present in poppler 0.24.x series.

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=19595&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 Fri Oct 17 22:53:22 2014
@@ -1210,7 +1210,7 @@
 	true);
 }
 
-void SlaOutputDev::startPage(int pageNum, GfxState *)
+void SlaOutputDev::startPage(int pageNum, GfxState *, XRef *)
 {
 	m_formWidgets = pdfDoc->getPage(pageNum)->getFormWidgets();
 	m_radioMap.clear();

Modified: trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19595&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 Fri Oct 17 22:53:22 2014
@@ -164,7 +164,7 @@
 	virtual GBool useShadedFills(int type) { return type <= 7; }
 	virtual GBool useFillColorStop() { return gTrue; }
 	virtual GBool useDrawForm() { return gFalse; }
-	virtual void startPage(int pageNum, GfxState *);
+	virtual void startPage(int pageNum, GfxState *, XRef *);
 	virtual void endPage();
 	// grapics state
 	virtual void saveState(GfxState *state);




More information about the scribus-commit mailing list