Merge lp:~alan-griffiths/compiz-expo-plugin/Bug-918554 into lp:compiz-expo-plugin

[Alan Griffiths]

Fix for https://bugs.launchpad.net/compiz-expo-plugin/+bug/918554

[Sam Spilsbury (smspillaz)]

Can you replace that with an inline function in compiz-core ? there are other plugins that have a similar macro, and having the same thing multiple times in the code is probably not a great thing ...

review: Needs Fixing

=== modified file 'src/expo.cpp'
--- src/expo.cpp	2011-09-20 14:38:27 +0000
+++ src/expo.cpp	2012-01-19 10:20:28 +0000
@@ -423,10 +423,10 @@
 	{
 	    float fi = (float) i;
 
-	    vpNormals[i * 3] = (-sin (fi * DEG2RAD) / screen->width ()) *
+	    vpNormals[i * 3] = (-sin (fi * (M_PI / 180.0f)) / screen->width ()) *
 			       expoCam;
 	    vpNormals[(i * 3) + 1] = 0.0;
-	    vpNormals[(i * 3) + 2] = (-cos (fi * DEG2RAD) * expoCam) -
+	    vpNormals[(i * 3) + 2] = (-cos (fi * (M_PI / 180.0f)) * expoCam) -
 		                     (1 - expoCam);
 	}
     }
@@ -857,9 +857,9 @@
 	curveAngle = interpolate (180 / vpSize.x (), 1, optionGetCurve ());
 
     curveDistance = ((0.5f * sx) + (gapX / 2.0)) /
-	            tanf (DEG2RAD * curveAngle / 2.0);
+	            tanf ((M_PI / 180.0f) * curveAngle / 2.0);
     curveRadius   = ((0.5f * sx) + (gapX / 2.0)) /
-		    sinf (DEG2RAD * curveAngle / 2.0);
+		    sinf ((M_PI / 180.0f) * curveAngle / 2.0);
 
     expoActive = true;