Merge branch 'develop' of ssh://forge-timc.imag.fr/camitk/camitkopensource into develop

3727ff31 · saubatn · 3ba44bba · 5bbe13de · 3727ff31 · 3727ff31
Commit 3727ff31 authored Mar 30, 2016 by saubatn
--- a/COPYRIGHT
+++ b/COPYRIGHT
 $CAMITK_LICENCE_BEGIN$

 CamiTK - Computer Assisted Medical Intervention ToolKit
-(c) 2001-2014 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
+(c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)

 Visit http://camitk.imag.fr for more information


--- a/imaging/COPYRIGHT
+++ b/imaging/COPYRIGHT
 $CAMITK_LICENCE_BEGIN$

 CamiTK - Computer Assisted Medical Intervention ToolKit
-(c) 2001-2013 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
+(c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)

 Visit http://camitk.imag.fr for more information


--- a/imaging/actions/itkfilters/AnisotropicDiffusion.impl
+++ b/imaging/actions/itkfilters/AnisotropicDiffusion.impl
@@ -2,7 +2,7 @@
 * $CAMITK_LICENCE_BEGIN$
 *
 * CamiTK - Computer Assisted Medical Intervention ToolKit
- * (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
+ * (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
 *
 * Visit http://camitk.imag.fr for more information
 *

--- a/imaging/actions/itkfilters/CannyEdgeDetection.impl
+++ b/imaging/actions/itkfilters/CannyEdgeDetection.impl
@@ -2,7 +2,7 @@
 * $CAMITK_LICENCE_BEGIN$
 *
 * CamiTK - Computer Assisted Medical Intervention ToolKit
- * (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
+ * (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
 *
 * Visit http://camitk.imag.fr for more information
 *

--- a/imaging/actions/itkfilters/ConnectedComponents.impl
+++ b/imaging/actions/itkfilters/ConnectedComponents.impl
@@ -2,7 +2,7 @@
 * $CAMITK_LICENCE_BEGIN$
 *
 * CamiTK - Computer Assisted Medical Intervention ToolKit
- * (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
+ * (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
 *
 * Visit http://camitk.imag.fr for more information
 *

--- a/imaging/actions/itkfilters/Derivative.impl
+++ b/imaging/actions/itkfilters/Derivative.impl
@@ -2,7 +2,7 @@
 * $CAMITK_LICENCE_BEGIN$
 *
 * CamiTK - Computer Assisted Medical Intervention ToolKit
- * (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
+ * (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
 *
 * Visit http://camitk.imag.fr for more information
 *

--- a/imaging/actions/itkfilters/GaussianFilter.impl
+++ b/imaging/actions/itkfilters/GaussianFilter.impl
@@ -2,7 +2,7 @@
 * $CAMITK_LICENCE_BEGIN$
 *
 * CamiTK - Computer Assisted Medical Intervention ToolKit
- * (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
+ * (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
 *
 * Visit http://camitk.imag.fr for more information
 *

--- a/imaging/actions/itkfilters/GradientMagnitude.impl
+++ b/imaging/actions/itkfilters/GradientMagnitude.impl
@@ -2,7 +2,7 @@
 * $CAMITK_LICENCE_BEGIN$
 *
 * CamiTK - Computer Assisted Medical Intervention ToolKit
- * (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
+ * (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
 *
 * Visit http://camitk.imag.fr for more information
 *

--- a/imaging/actions/itkfilters/GradientMagnitudeRecursiveGaussian.impl
+++ b/imaging/actions/itkfilters/GradientMagnitudeRecursiveGaussian.impl
@@ -2,7 +2,7 @@
 * $CAMITK_LICENCE_BEGIN$
 *
 * CamiTK - Computer Assisted Medical Intervention ToolKit
- * (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
+ * (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
 *
 * Visit http://camitk.imag.fr for more information
 *

--- a/imaging/actions/itkfilters/Laplacian.impl
+++ b/imaging/actions/itkfilters/Laplacian.impl
@@ -2,7 +2,7 @@
 * $CAMITK_LICENCE_BEGIN$
 *
 * CamiTK - Computer Assisted Medical Intervention ToolKit
- * (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
+ * (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
 *
 * Visit http://camitk.imag.fr for more information
 *

--- a/imaging/actions/itkfilters/LaplacianRecursiveGaussian.impl
+++ b/imaging/actions/itkfilters/LaplacianRecursiveGaussian.impl
@@ -2,7 +2,7 @@
 * $CAMITK_LICENCE_BEGIN$
 *
 * CamiTK - Computer Assisted Medical Intervention ToolKit
- * (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
+ * (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
 *
 * Visit http://camitk.imag.fr for more information
 *

--- a/imaging/actions/itkfilters/LaplacianSharpening.impl
+++ b/imaging/actions/itkfilters/LaplacianSharpening.impl
@@ -2,7 +2,7 @@
 * $CAMITK_LICENCE_BEGIN$
 *
 * CamiTK - Computer Assisted Medical Intervention ToolKit
- * (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
+ * (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
 *
 * Visit http://camitk.imag.fr for more information
 *

--- a/imaging/actions/itkfilters/MeanFilter.impl
+++ b/imaging/actions/itkfilters/MeanFilter.impl
@@ -2,7 +2,7 @@
 * $CAMITK_LICENCE_BEGIN$
 *
 * CamiTK - Computer Assisted Medical Intervention ToolKit
- * (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
+ * (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
 *
 * Visit http://camitk.imag.fr for more information
 *

--- a/imaging/actions/itkfilters/MedianFilter.impl
+++ b/imaging/actions/itkfilters/MedianFilter.impl
@@ -2,7 +2,7 @@
 * $CAMITK_LICENCE_BEGIN$
 *
 * CamiTK - Computer Assisted Medical Intervention ToolKit
- * (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
+ * (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
 *
 * Visit http://camitk.imag.fr for more information
 *

--- a/imaging/actions/itkfilters/MorphologicalOperators.impl
+++ b/imaging/actions/itkfilters/MorphologicalOperators.impl
@@ -2,7 +2,7 @@
 * $CAMITK_LICENCE_BEGIN$
 *
 * CamiTK - Computer Assisted Medical Intervention ToolKit
- * (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
+ * (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
 *
 * Visit http://camitk.imag.fr for more information
 *

--- a/imaging/actions/itkfilters/SobelEdgeDetection.impl
+++ b/imaging/actions/itkfilters/SobelEdgeDetection.impl
@@ -2,7 +2,7 @@
 * $CAMITK_LICENCE_BEGIN$
 *
 * CamiTK - Computer Assisted Medical Intervention ToolKit
- * (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
+ * (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
 *
 * Visit http://camitk.imag.fr for more information
 *

--- a/imaging/actions/itksegmentation/ManualThreshold.impl
+++ b/imaging/actions/itksegmentation/ManualThreshold.impl
@@ -2,7 +2,7 @@
 * $CAMITK_LICENCE_BEGIN$
 *
 * CamiTK - Computer Assisted Medical Intervention ToolKit
- * (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
+ * (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
 *
 * Visit http://camitk.imag.fr for more information
 *

--- a/imaging/actions/itksegmentation/OtsuFilter.impl
+++ b/imaging/actions/itksegmentation/OtsuFilter.impl
@@ -2,7 +2,7 @@
 * $CAMITK_LICENCE_BEGIN$
 *
 * CamiTK - Computer Assisted Medical Intervention ToolKit
- * (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
+ * (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
 *
 * Visit http://camitk.imag.fr for more information
 *

--- a/imaging/actions/itksegmentation/RegionGrowing.impl
+++ b/imaging/actions/itksegmentation/RegionGrowing.impl
@@ -2,7 +2,7 @@
 * $CAMITK_LICENCE_BEGIN$
 *
 * CamiTK - Computer Assisted Medical Intervention ToolKit
- * (c) 2001-2012 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
+ * (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
 *
 * Visit http://camitk.imag.fr for more information
 *

--- a/imaging/components/dicomitk/DicomItkComponent.cpp
+++ b/imaging/components/dicomitk/DicomItkComponent.cpp
@@ -2,7 +2,7 @@
 * $CAMITK_LICENCE_BEGIN$
 *
 * CamiTK - Computer Assisted Medical Intervention ToolKit
- * (c) 2001-2014 UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
+ * (c) 2001-2016 Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)
 *
 * Visit http://camitk.imag.fr for more information
 *