r22300 by craig -

scribus-commit scribus-commit at lists.scribus.net
Fri Dec 29 22:24:40 UTC 2017


Author: craig
Date: Fri Dec 29 22:24:40 2017
New Revision: 22300

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22300
Log:
Fix Coverity 1350550 / 1350551

Modified:
    trunk/Scribus/scribus/guidemanagercore.cpp

Modified: trunk/Scribus/scribus/guidemanagercore.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22300&path=/trunk/Scribus/scribus/guidemanagercore.cpp
==============================================================================
--- trunk/Scribus/scribus/guidemanagercore.cpp	(original)
+++ trunk/Scribus/scribus/guidemanagercore.cpp	Fri Dec 29 22:24:40 2017
@@ -242,11 +242,11 @@
 {
 	Guides guides;
 	int value = m_horizontalAutoCount;
-	double newPageHeight = (page == NULL) ? 0.0 : page->height();
 	if (page == NULL)
 		page = m_page;
 	if (page == NULL)
 		return guides;
+	double newPageHeight = page->height();
 	if (m_horizontalAutoCount == 0)
 		return guides;
 	++value;
@@ -289,11 +289,11 @@
 {
 	Guides guides;
 	int value = m_verticalAutoCount;
-	double newPageWidth = (page == NULL) ? 0.0 : page->width();
 	if (page == NULL)
 		page = m_page;
 	if (page == NULL)
 		return guides;
+	double newPageWidth = page->width();
 	if (m_verticalAutoCount == 0)
 		return guides;
 	++value;




More information about the scribus-commit mailing list