[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.6/kdegames/kolf
From:       Jonathan Michael Thomas <echidnaman () kubuntu ! org>
Date:       2010-12-26 3:44:57
Message-ID: 20101226034457.82B80AC80E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1209237 by jmthomas:

Backport r1209228 to fix compilation on ARM architectures


 M  +2 -2      shape.cpp  


--- branches/KDE/4.6/kdegames/kolf/shape.cpp #1209236:1209237
@@ -156,8 +156,8 @@
 	const b2Vec2 c = toB2Vec2(m_rect.center() * Kolf::Box2DScaleFactor);
 	//ensure some minimum size because b2PolygonShape gets confused when its
 	//area is smaller than FLT_EPSILON (TODO: handle rx*ry == 0 differently?)
-	const qreal rx = qMax(m_rect.width() * Kolf::Box2DScaleFactor / 2, 1e-5);
-	const qreal ry = qMax(m_rect.height() * Kolf::Box2DScaleFactor / 2, 1e-5);
+	const qreal rx = qMax(qreal(m_rect.width() * Kolf::Box2DScaleFactor / 2), qreal(1e-5));
+	const qreal ry = qMax(qreal(m_rect.height() * Kolf::Box2DScaleFactor / 2), qreal(1e-5));
 	if (rx == ry)
 	{
 		//use circle shape when possible because it's cheaper and exact
[prev in list] [next in list] [prev in thread] [next in thread]