r20144 by jghali - #13106: Linux Libertine G font family + Insert Thin Space == Crash

scribus-commit scribus-commit at lists.scribus.net
Tue Jun 2 21:15:35 UTC 2015


Author: jghali
Date: Tue Jun  2 21:15:35 2015
New Revision: 20144

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20144
Log:
#13106: Linux Libertine G font family + Insert Thin Space == Crash

Modified:
    trunk/Scribus/scribus/pageitem_textframe.cpp

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20144&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp Tue Jun  2 21:15:35 2015
@@ -675,9 +675,10 @@
 		double maxX = colRight - morespace;
 		if (legacy) maxX -= lineCorr;
 
-		double StartX = floor(qMax(line.x, qMin(maxX,breakXPos-maxShrink-1))-1);
+		double StartX = floor(qMax(line.x, qMin(maxX, breakXPos-maxShrink-1))-1);
+		StartX = qMax(0.0, StartX);
+
 		int xPos  = static_cast<int>(ceil(maxX));
-
 		QPoint  pt12 (xPos, yAsc);
 		QPoint  pt22 (xPos, yDesc);
 




More information about the scribus-commit mailing list