#3465 Doxygen OFF in CMake

[creaRigidRegistration.git] / lib / Substraction.cxx

diff --git a/lib/Substraction.cxx b/lib/Substraction.cxx
index 96f01a402ecb28569f88fd9c2b41cc9fa064781b..734a06ca6baacb3896fc65b022d1a5ddb8d7e69a 100644 (file)
--- a/lib/Substraction.cxx
+++ b/lib/Substraction.cxx
@@ -1,3 +1,29 @@
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------      */                                                                    
+
 #include "Substraction.h"
 
 Substraction::Substraction(vtkImageData* imageData1,vtkImageData* imageData2, int uZLevel,int lZLevel, std::vector<double> uColor, std::vector<double> lColor, std::vector<double> mColor)
@@ -94,11 +120,17 @@ void Substraction::substractImage(vtkImageData* imageData1, vtkImageData* imageD
 void Substraction::initialize(int dimensions[], double spacing[])
 {
        //setting image data of the imageResult
-       imageResult->SetScalarType(imageType);
        imageResult->SetSpacing(spacing);
        imageResult->SetDimensions(dimensions);
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+       imageResult->SetScalarType(imageType);
        imageResult->AllocateScalars();
        imageResult->Update();
+#else
+       imageResult->AllocateScalars(imageType,1);
+#endif
+
 }
 
 /*