--- gdcmFile.cxx	22 Jul 2005 03:33:13 -0000	1.256
+++ gdcmFile.cxx	22 Jul 2005 22:39:16 -0000
@@ -1898,6 +1898,12 @@
    return res;
 } 
 
+template <typename T>
+inline static T pow2 (T const& a)
+{
+  return a * a;
+}
+
 float File::CalculLikelyhood2Vec(vector3D refA, vector3D refB, 
                                  vector3D ori1, vector3D ori2)
 {
@@ -1920,9 +1926,9 @@
 
    vector3D ori3 = ProductVectorial(ori1,ori2);
    vector3D refC = ProductVectorial(refA,refB);
-   float    res  = powf(refC.x-ori3.x, 2.) + 
-                   powf(refC.y-ori3.y, 2.) + 
-                   powf(refC.z-ori3.z, 2.);
+   float    res  = pow2(refC.x-ori3.x) + 
+                   pow2(refC.y-ori3.y) + 
+                   pow2(refC.z-ori3.z);
 
 /*
 //   ori3=self.ProductVectorial(ori1,ori2)
@@ -1946,7 +1952,7 @@
 //   # ------------------------- Other : -------------------------------------
 
    vector3D vec3;
-   vec3.x =    vec1.y*vec3.z - vec1.z*vec2.y;
+   vec3.x =    vec1.y*vec2.z - vec1.z*vec2.y;
    vec3.y = -( vec1.x*vec2.z - vec1.z*vec2.x);
    vec3.z =    vec1.x*vec2.y - vec1.y*vec2.x;
 /*