Changeset 26542 in webkit for trunk/JavaScriptCore/wtf/MathExtras.h

Timestamp:

Oct 12, 2007, 8:40:54 AM (18 years ago)

Author:

oliver

Message:

JavaScriptCore:

Reviewed by Eric Seidel.

Fix for ​http://bugs.webkit.org/show_bug.cgi?id=15076
"deg2rad has multiple definitions"

Define deg2rad, rad2deg, deg2grad, grad2deg, rad2grad, grad2rad
These are used through WebKit.

Change based on original patch by Rob Buis.

• wtf/MathExtras.h: (deg2rad): (rad2deg): (deg2grad): (grad2deg): (rad2grad): (grad2rad):

WebCore:

Reviewed by Eric Seidel.

Fix for ​http://bugs.webkit.org/show_bug.cgi?id=15076
"deg2rad has multiple definitions"

Use deg2rad, rad2deg, deg2grad, grad2deg, rad2grad, grad2rad
from wtf where appropriate.

No test cases as this doesn't change behaviour.

Change based on original patch by Rob Buis.

• ksvg2/svg/SVGAngle.cpp: (WebCore::SVGAngle::calculate): (WebCore::SVGAngle::convertToSpecifiedUnits): (WebCore::SVGAngle::todeg): (WebCore::SVGAngle::torad):
• platform/graphics/AffineTransform.cpp: (WebCore::AffineTransform::rotateFromVector): (WebCore::AffineTransform::skewX): (WebCore::AffineTransform::skewY):
• platform/graphics/cg/AffineTransformCG.cpp: (WebCore::AffineTransform::rotate):
• platform/graphics/svg/filters/cg/SVGFEColorMatrixCg.mm:
• platform/graphics/svg/filters/cg/SVGFEHelpersCg.h:
• platform/graphics/svg/filters/cg/SVGFEHelpersCg.mm:
• rendering/RenderPath.cpp: (WebCore::drawMarkerWithData):

File:

• trunk/JavaScriptCore/wtf/MathExtras.h (modified) (1 diff)

trunk/JavaScriptCore/wtf/MathExtras.h

@@ -137 +137 @@
 #endif // #if COMPILER(MSVC)
 
+inline double deg2rad(double d)  { return d * piDouble / 180.0; }
+inline double rad2deg(double r)  { return r * 180.0 / piDouble; }
+inline double deg2grad(double d) { return d * 400.0 / 360.0; }
+inline double grad2deg(double g) { return g * 360.0 / 400.0; }
+inline double rad2grad(double r) { return r * 200.0 / piDouble; }
+inline double grad2rad(double g) { return g * piDouble / 200.0; }
+
+inline float deg2rad(float d)  { return d * piFloat / 180.0f; }
+inline float rad2deg(float r)  { return r * 180.0f / piFloat; }
+inline float deg2grad(float d) { return d * 400.0f / 360.0f; }
+inline float grad2deg(float g) { return g * 360.0f / 400.0f; }
+inline float rad2grad(float r) { return r * 200.0f / piFloat; }
+inline float grad2rad(float g) { return g * piFloat / 200.0f; }
+
 #endif // #ifndef WTF_MathExtras_h