Merge branch 'maint' into next

[simgear.git] / simgear / math / SGVec2.hxx

diff --git a/simgear/math/SGVec2.hxx b/simgear/math/SGVec2.hxx
index 155b8a670a49dc9c7d3f28ecaa2487c2fa7caed1..0409ee44695488c72c08babe25d7876b435282b7 100644 (file)
--- a/simgear/math/SGVec2.hxx
+++ b/simgear/math/SGVec2.hxx
@@ -18,6 +18,10 @@
 #ifndef SGVec2_H
 #define SGVec2_H
 
+#if defined ( __CYGWIN__ )
+#include <ieeefp.h>
+#endif
+
 #include <osg/Vec2f>
 #include <osg/Vec2d>
 
@@ -204,6 +208,15 @@ SGVec2<T>
 operator*(const SGVec2<T>& v, S s)
 { return SGVec2<T>(s*v(0), s*v(1)); }
 
+/// multiplication as a multiplicator, that is assume that the first vector
+/// represents a 2x2 diagonal matrix with the diagonal elements in the vector.
+/// Then the result is the product of that matrix times the second vector.
+template<typename T>
+inline
+SGVec2<T>
+mult(const SGVec2<T>& v1, const SGVec2<T>& v2)
+{ return SGVec2<T>(v1(0)*v2(0), v1(1)*v2(1)); }
+
 /// component wise min
 template<typename T>
 inline