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

List:       kde-commits
Subject:    KDE/kdegames/kolf
From:       Harald Sitter <sitter () kde ! org>
Date:       2010-12-26 0:07:30
Message-ID: 20101226000730.DB800AC80E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1209228 by sitter:

qreal fix to make kolf build on ARM (note that I also added qreal for the first qMax \
expression to make sure it does not break if the implict qrealism goes away for one \
reason or another)


 M  +2 -2      shape.cpp  


--- trunk/KDE/kdegames/kolf/shape.cpp #1209227:1209228
@@ -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]