r17299 by malex - 2 more fixes for the armel build failures

[scribus-commit]

Author: malex
Date: Tue Feb 14 22:12:22 2012
New Revision: 17299

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17299
Log:
2 more fixes for the armel build failures

Modified:
    branches/Version14x/Scribus/scribus/pageitem_textframe.cpp
    branches/Version14x/Scribus/scribus/scribusview.cpp

Modified: branches/Version14x/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17299&path=/branches/Version14x/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/pageitem_textframe.cpp (original)
+++ branches/Version14x/Scribus/scribus/pageitem_textframe.cpp Tue Feb 14 22:12:22 2012
@@ -554,7 +554,7 @@
 		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);

Modified: branches/Version14x/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17299&path=/branches/Version14x/Scribus/scribus/scribusview.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scribusview.cpp (original)
+++ branches/Version14x/Scribus/scribus/scribusview.cpp Tue Feb 14 22:12:22 2012
@@ -1712,7 +1712,7 @@
 			if (transform.isInvertible() && currItem->itemText.length() > 0)
 			{
 				double tx = 0, ty = 0;
-				transform.inverted().map(pf.x(), pf.y(), &tx, &ty);
+				transform.inverted().map(qreal(pf.x()), qreal(pf.y()), (qreal*)&tx, (qreal*)&ty);
 				point.setXY(tx, ty);
 			}
 			if (currItem->reversed())