synched with trunk at revision 30597

2 files changed, 6 insertions, 6 deletions

diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
index 50a79451f5d..07262b95b73 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
@@ -601,7 +601,7 @@ void btConeTwistConstraint::calcAngleInfo2()
 	m_solveSwingLimit = false;
 	// compute rotation of A wrt B (in constraint space)
 	if (m_bMotorEnabled && (!m_useSolveConstraintObsolete))
-	{	// it is assumed that setMotorTarget() was alredy called 
+	{	// it is assumed that setMotorTarget() was already called 
 		// and motor target m_qTarget is within constraint limits
 		// TODO : split rotation to pure swing and pure twist
 		// compute desired transforms in world
diff --git a/extern/libopenjpeg/dwt.c b/extern/libopenjpeg/dwt.c
index 78d18d175f4..357b475b9ac 100644
--- a/extern/libopenjpeg/dwt.c
+++ b/extern/libopenjpeg/dwt.c
@@ -610,7 +610,7 @@ static void v4dwt_decode_step1_sse(v4* w, int count, const __m128 c){
 	int i;
 	for(i = 0; i < count; ++i){
 		__m128 tmp = vw[i*2];
-		vw[i*2] = tmp * c;
+		vw[i*2] = _mm_mul_ps(tmp, c);
 	}
 }
 
@@ -622,18 +622,18 @@ static void v4dwt_decode_step2_sse(v4* l, v4* w, int k, int m, __m128 c){
 		__m128 tmp1 = vl[ 0];
 		__m128 tmp2 = vw[-1];
 		__m128 tmp3 = vw[ 0];
-		vw[-1] = tmp2 + ((tmp1 + tmp3) * c);
+		vw[-1] = _mm_add_ps(tmp2, _mm_mul_ps(_mm_add_ps(tmp1, tmp3), c));
 		vl = vw;
 		vw += 2;
 	}
 	if(m >= k){
 		return;
 	}
-	c += c;
-	c *= vl[0];
+	c = _mm_add_ps(c, c);
+	c = _mm_mul_ps(c, vl[0]);
 	for(; m < k; ++m){
 		__m128 tmp = vw[-1];
-		vw[-1] = tmp + c;
+		vw[-1] = _mm_add_ps(tmp, c);
 		vw += 2;
 	}
 }