Merge branch 'master' of git.creatis.insa-lyon.fr:clitk

diff --git a/common/clitkCommon.cxx b/common/clitkCommon.cxx
index 10f608e6ce8b7ba7c92d6085f4d1b1588a047e3d..57be29e5297f833d53769818b0aa097cb3d93a6c 100644 (file)
--- a/common/clitkCommon.cxx
+++ b/common/clitkCommon.cxx
@@ -104,6 +104,15 @@ float clitk::PixelTypeDownCast(const double & x)
 }
 //------------------------------------------------------------------
 
+//------------------------------------------------------------------
+// Convert a pixel type without casting
+template<>
+double clitk::PixelTypeDownCast(const double & x)
+{
+  return x;
+}
+//------------------------------------------------------------------
+
 //------------------------------------------------------------------
 double clitk::rad2deg(const double anglerad)
 {

diff --git a/common/clitkCommon.h b/common/clitkCommon.h
index b58974a3e721c486e6ff164f7ff2f18d25a25673..94d1c607b6049e7d353e1209a4e31b6ba39b5d77 100644 (file)
--- a/common/clitkCommon.h
+++ b/common/clitkCommon.h
@@ -117,6 +117,8 @@ namespace clitk {
   TPixelDown PixelTypeDownCast(const TPixelUp & x);
   template<>
   float PixelTypeDownCast(const double & x);
+  template<>
+  double PixelTypeDownCast(const double & x);
 
   //--------------------------------------------------------------------
   // Return the indexes of sorted values in a vector

diff --git a/registration/clitkBSplineDeformableTransform.h b/registration/clitkBSplineDeformableTransform.h
index f5b269828fffb20b5759ae061d8390e3f8698908..392247f25717e80e6dede00e6e8167414af11b4a 100644 (file)
--- a/registration/clitkBSplineDeformableTransform.h
+++ b/registration/clitkBSplineDeformableTransform.h
@@ -387,7 +387,7 @@ namespace clitk
 
 }  // namespace itk
 
-#if ITK_TEMPLATE_TXX
+#ifndef ITK_MANUAL_INSTANTIATION
 # include "clitkBSplineDeformableTransform.txx"
 #endif
 

diff --git a/registration/clitkMatrixTransformToVFGenericFilter.txx b/registration/clitkMatrixTransformToVFGenericFilter.txx
index d864900c0cc0d37a6d299d000634300fe818717c..a1241b5358cc06a0ab63065be57a2f41134c0bfe 100644 (file)
--- a/registration/clitkMatrixTransformToVFGenericFilter.txx
+++ b/registration/clitkMatrixTransformToVFGenericFilter.txx
@@ -101,6 +101,7 @@ namespace clitk
        typename OutputImageType::Pointer image=reader2->GetOutput();
 #if ITK_VERSION_MAJOR > 4 || (ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR >= 6)
     filter->SetReferenceImage(image);
+    filter->UseReferenceImageOn();
 #else
     filter->SetOutputParametersFromImage(image);
 #endif

diff --git a/registration/clitkMultipleBSplineDeformableTransform.h b/registration/clitkMultipleBSplineDeformableTransform.h
index 5b2ee9eb35686933603bb10b4f22796e1be100b7..1b7909ab6f35146deac97d95cc1ed689bf45d81b 100644 (file)
--- a/registration/clitkMultipleBSplineDeformableTransform.h
+++ b/registration/clitkMultipleBSplineDeformableTransform.h
@@ -289,7 +289,7 @@ namespace clitk
 
 }  // namespace clitk
 
-#if ITK_TEMPLATE_TXX
+#ifndef ITK_MANUAL_INSTANTIATION
 # include "clitkMultipleBSplineDeformableTransform.txx"
 #endif
 

diff --git a/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.h b/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.h
index c9fb588e30f83641260459a16e9d57e0cd684a66..b1924580c503d9ff9f62f58cdc29cb004a66bfa7 100644 (file)
--- a/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.h
+++ b/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.h
@@ -454,7 +454,7 @@ namespace clitk
 
 }  // namespace itk
 
-#if ITK_TEMPLATE_TXX
+#ifndef ITK_MANUAL_INSTANTIATION
 # include "clitkShapedBLUTSpatioTemporalDeformableTransform.txx"
 #endif