From 14d21cfb22880a2cefa966fd2b43e53707ffd79a Mon Sep 17 00:00:00 2001
From: malex <malex@11d20701-8431-0410-a711-e3c959e3b870>
Date: Tue, 14 Feb 2012 22:12:22 +0000
Subject: 2 more fixes for the armel build failures

git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17299 11d20701-8431-0410-a711-e3c959e3b870
---
 scribus/pageitem_textframe.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scribus/pageitem_textframe.cpp')

diff --git a/scribus/pageitem_textframe.cpp b/scribus/pageitem_textframe.cpp
index fb7c07b..b5b0378 100644
--- a/scribus/pageitem_textframe.cpp
+++ b/scribus/pageitem_textframe.cpp
@@ -554,7 +554,7 @@ struct LineControl {
 		double maxX = colRight - morespace;
 		if (legacy) maxX -= lineCorr;
 
-		double StartX = floor(qMax(line.x, qMin(maxX,breakXPos-maxShrink-1))-1);
+		double StartX = floor(qMax((double)line.x, qMin(maxX,breakXPos-maxShrink-1))-1);
 		int xPos  = static_cast<int>(ceil(maxX));
 
 		QPoint  pt12 (xPos, yAsc);
-- 
cgit