[med-svn] [elastix] 01/02: d/p/itk4.11.patch: Make it compile with itk >= 4.11

[Gert Wollny]

This is an automated email from the git hooks/post-receive script.

gewo pushed a commit to branch master
in repository elastix.

commit ae492bddaef88499bdeb7095e08526734a4d5c57
Author: Gert Wollny <gewo at debian.org>
Date:   Fri Jul 14 09:28:16 2017 +0000

    d/p/itk4.11.patch: Make it compile with itk >= 4.11
---
 debian/patches/itk4.11.patch | 58 ++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series        |  1 +
 2 files changed, 59 insertions(+)

diff --git a/debian/patches/itk4.11.patch b/debian/patches/itk4.11.patch
new file mode 100644
index 0000000..d913f7e
--- /dev/null
+++ b/debian/patches/itk4.11.patch
@@ -0,0 +1,58 @@
+From d7c17629cac6c66149b19a8cd0feb9f909db55e7 Mon Sep 17 00:00:00 2001
+From: Kasper Marstal <kaspermarstal at gmail.com>
+Date: Thu, 16 Mar 2017 10:40:24 +0000
+Description: Fix compilation with ITK >= 4.11 anc correct docu
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ dox/manual/manual.tex                                               | 6 ++++++
+ src/Common/itkImageFileCastWriter.h                                 | 6 ++++++
+ .../Transforms/BSplineStackTransform/elxBSplineStackTransform.h     | 2 ++
+ .../elxMultiBSplineTransformWithNormal.h                            | 2 ++
+ .../RecursiveBSplineTransform/elxRecursiveBSplineTransform.h        | 2 ++
+ 5 files changed, 18 insertions(+)
+
+--- a/dox/manual/manual.tex
++++ b/dox/manual/manual.tex
+@@ -1749,6 +1749,12 @@
+ \begin{quote}
+ \texttt{(FinalGridSpacingInVoxels 16.0 16.0 16.0)}
+ \end{quote}
++
++Note that in the case of providing an affine transformation as initial
++transformation to the B-spline registration, elastix will scale
++the control grid to cover the fixed image domain in the space
++defined by the initial transform.
++
+ If the final B-spline grid spacing is chosen high, then you cannot
+ match small structures. On the other hand, if the grid spacing is
+ chosen very low, then small structures can be matched, but you
+--- a/src/Common/itkImageFileCastWriter.h
++++ b/src/Common/itkImageFileCastWriter.h
+@@ -99,7 +99,13 @@
+     typename CasterType::Pointer caster                    = CasterType::New();
+     this->m_Caster                                         = caster;
+     typename ScalarInputImageType::Pointer localInputImage = ScalarInputImageType::New();
++
++#if ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR >= 11
++    localInputImage->Graft( static_cast< const ScalarInputImageType * >(inputImage) );
++#else
+     localInputImage->Graft( inputImage );
++#endif
++
+     caster->SetInput( localInputImage );
+     caster->Update();
+ 
+--- a/src/Components/Transforms/MultiBSplineTransformWithNormal/elxMultiBSplineTransformWithNormal.h
++++ b/src/Components/Transforms/MultiBSplineTransformWithNormal/elxMultiBSplineTransformWithNormal.h
+@@ -53,6 +53,8 @@
+  *    If not specified, the FinalGridSpacingInVoxels is used, or the FinalGridSpacing,
+  *    to compute a FinalGridSpacingInPhysicalUnits. If those are not specified, the default
+  *    value for FinalGridSpacingInVoxels is used to compute a FinalGridSpacingInPhysicalUnits.
++ *    If an affine transformation is provided as initial transformation, the control grid
++ *    will be scaled to cover the fixed image domain in the space defined by the initial transformation.
+  * \parameter GridSpacingSchedule: the grid spacing downsampling factors for the B-spline transform
+  *    for each dimension and each resolution. \n
+  *    example: <tt>(GridSpacingSchedule 4.0 4.0 2.0 2.0 1.0 1.0)</tt> \n
diff --git a/debian/patches/series b/debian/patches/series
index 5b741e4..d630635 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ doxygen_use_epoch_for_data_if_given.patch
 fix-cast-error.patch
 fix-compilation-with-std-c++11.patch
 itk4.10.patch
+itk4.11.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/elastix.git