r21972 by craig - Coverity 1398523: Fix uninitialised member variable

scribus-commit scribus-commit at lists.scribus.net
Sat Apr 22 16:38:26 UTC 2017


Author: craig
Date: Sat Apr 22 16:38:25 2017
New Revision: 21972

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21972
Log:
Coverity 1398523: Fix uninitialised member variable

Modified:
    trunk/Scribus/scribus/pageitem_textframe.cpp

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21972&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp	Sat Apr 22 16:38:25 2017
@@ -418,19 +418,21 @@
 	{
 		x = 0.0;
 		y = 0.0;
+		width  = 0.0;
+		height = 0.0;
+		ascent = 0.0;
+		descent = 0.0;
+		colLeft = 0.0;
 		firstCluster = 0;
 		lastCluster = 0;
-		ascent = 0.0;
-		descent = 0.0;
-		width  = 0.0;
-		height = 0.0;
 		naturalWidth = 0.0;
-		colLeft = 0.0;
+		isFirstLine = false;
 	}
 
 	qreal x;
 	qreal y;
 	qreal width;
+	qreal height;
 	qreal ascent;
 	qreal descent;
 	qreal colLeft;
@@ -439,7 +441,6 @@
 	int lastCluster;
 	qreal naturalWidth;
 	bool isFirstLine;
-	qreal height;
 };
 
 /**
@@ -494,7 +495,6 @@
 		colWidth = colwidth;
 		colGap = colgap;
 		hyphenCount = 0;
-
 		isEmpty = true;
 		colLeft = insets.left() + lineCorr;
 		colRight = colLeft + colWidth;




More information about the scribus-commit mailing list