X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkTransformUtilities.h;h=d3644b19206f830eab30397f2c209ef721eca6f4;hb=c25dc5b9c8094da27269fa006f847ddd8154c8e1;hp=3bdf22026ee0ab969a5fe8f6274db3a0fd4fa2e3;hpb=01d3c1060300fd0f117709f6c2e5d39d16781c2f;p=clitk.git

diff --git a/common/clitkTransformUtilities.h b/common/clitkTransformUtilities.h
index 3bdf220..d3644b1 100644
--- a/common/clitkTransformUtilities.h
+++ b/common/clitkTransformUtilities.h
@@ -23,7 +23,8 @@
 #include "itkPoint.h"
 #include "clitkImageCommon.h"
 #include "clitkCommon.h"
- 
+#include <vtkMatrix4x4.h>
+#include <vtkSmartPointer.h>
  
 namespace clitk
 {
@@ -254,8 +255,9 @@ namespace clitk
     return matrix; 
   }
    
-  inline itk::Matrix<double, 4, 4> ReadMatrix3D(std::string fileName)
-  {
+  itk::Matrix<double, 4, 4> ReadMatrix3D(std::string fileName);
+ 
+  inline vtkMatrix4x4* ReadVTKMatrix3D(std::string fileName) {
     // read input matrix
     std::ifstream is;
     openFileForReading(is, fileName);
@@ -266,18 +268,18 @@ namespace clitk
     while (!is.eof()) {
       nb.push_back(x);
       skipComment(is);
-      is >> x;  
+      is >> x;
     }
-     
-    //copy it to the matrix
-    itk::Matrix<double, 4, 4> matrix;
+
+    vtkSmartPointer<vtkMatrix4x4> matrix = vtkSmartPointer<vtkMatrix4x4>::New();
     unsigned int index=0;
     for (unsigned int i=0;i<4;i++)
       for (unsigned int j=0;j<4;j++)
- 	matrix[i][j]=nb[index++];
-    return matrix; 
+         matrix->SetElement(i,j, nb[index++]);
+
+    return matrix;
   }
- 
+
   inline itk::Matrix<double, 3, 3> ReadMatrix2D(std::string fileName)
   {
     // read input matrix