Package: elastix / 4.8-10

Metadata

Package Version Patches format
elastix 4.8-10 3.0 (quilt)

Patch series

view the series file
Patch File delta Description
build static ann.patch | (download)

src/Common/KNN/ann_1.1/CMakeLists.txt | 14 1 + 13 - 0 !
1 file changed, 1 insertion(+), 13 deletions(-)

 build convenience static ann library
doxygen_cleanup.patch | (download)

dox/doxygen/DoxygenFooter.html.in | 14 1 + 13 - 0 !
dox/doxygen/DoxygenHeader.html | 18 2 + 16 - 0 !
dox/doxygen/doxyfile.in | 10 5 + 5 - 0 !
3 files changed, 8 insertions(+), 34 deletions(-)

 cleanup of the doxygen generated documentation 
doxygen_use_epoch_for_data_if_given.patch | (download)

src/CMakeLists.txt | 9 8 + 1 - 0 !
1 file changed, 8 insertions(+), 1 deletion(-)

 use source_date_epoch if available to set doc data 
fix cast error.patch | (download)

src/Components/Optimizers/AdaptiveStochasticGradientDescent/elxAdaptiveStochasticGradientDescent.hxx | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 fix ftbfs because of an overload issue with itk-4.9

In file included from /PKGBUILDDIR/src/Components/Optimizers/AdaptiveStochasticGradientDescent/elxAdaptiveStochasticGradientDescent.h:430:0,
                 from /PKGBUILDDIR/src/Components/Optimizers/AdaptiveStochasticGradientDescent/elxAdaptiveStochasticGradientDescent.cxx:19:
/PKGBUILDDIR/src/Components/Optimizers/AdaptiveStochasticGradientDescent/elxAdaptiveStochasticGradientDescent.hxx:194:45: error: call of overloaded 'vnl_math_min(const unsigned int&, int)' is ambiguous
     const unsigned int movdim = vnl_math_min( this->GetElastix()->MovingDimension, 2 );
                                             ^
In file included from /usr/include/ITK-4.9/itkVector.hxx:21:0,
                 from /usr/include/ITK-4.9/itkVector.h:289,
                 from /usr/include/ITK-4.9/itkPoint.h:23,
                 from /usr/include/ITK-4.9/itkContinuousIndex.h:21,
                 from /usr/include/ITK-4.9/itkImageRegion.h:34,
                 from /usr/include/ITK-4.9/itkImageIORegion.h:24,
                 from /usr/include/ITK-4.9/itkImageIOBase.h:26,
                 from /usr/include/ITK-4.9/itkImageFileReader.h:24,
                 from /PKGBUILDDIR/src/Core/Kernel/elxElastixBase.h:39,
                 from /PKGBUILDDIR/src/Core/Kernel/elxElastixTemplate.h:21,
                 from /PKGBUILDDIR/src/Core/Install/elxIncludes.h:39,
                 from /PKGBUILDDIR/src/Components/Optimizers/AdaptiveStochasticGradientDescent/elxAdaptiveStochasticGradientDescent.h:21,
                 from /PKGBUILDDIR/src/Components/Optimizers/AdaptiveStochasticGradientDescent/elxAdaptiveStochasticGradientDescent.cxx:19:
/usr/include/ITK-4.9/vnl/vnl_math.h:567:27: note: candidate: int vnl_math_min(int, int)
 inline int                vnl_math_min(int x, int y)                               { return (x < y) ? x : y; }
                           ^
/usr/include/ITK-4.9/vnl/vnl_math.h:568:27: note: candidate: unsigned int vnl_math_min(unsigned int, unsigned int)
 inline unsigned int       vnl_math_min(unsigned int x, unsigned int y)             { return (x < y) ? x : y; }
                           ^
/usr/include/ITK-4.9/vnl/vnl_math.h:569:27: note: candidate: long int vnl_math_min(long int, long int)
 inline long               vnl_math_min(long x, long y)                             { return (x < y) ? x : y; }
                           ^
/usr/include/ITK-4.9/vnl/vnl_math.h:570:27: note: candidate: long unsigned int vnl_math_min(long unsigned int, long unsigned int)
 inline unsigned long      vnl_math_min(unsigned long x, unsigned long y)           { return (x < y) ? x : y; }
                           ^
/usr/include/ITK-4.9/vnl/vnl_math.h:571:27: note: candidate: long long int vnl_math_min(long long int, long long int)
 inline long long          vnl_math_min(long long x, long long y)                   { return (x < y) ? x : y; }
                           ^
/usr/include/ITK-4.9/vnl/vnl_math.h:572:27: note: candidate: long long unsigned int vnl_math_min(long long unsigned int, long long unsigned int)
 inline unsigned long long vnl_math_min(unsigned long long x, unsigned long long y) { return (x < y) ? x : y; }
                           ^
/usr/include/ITK-4.9/vnl/vnl_math.h:573:27: note: candidate: float vnl_math_min(float, float)
 inline float              vnl_math_min(float x, float y)                           { return (x > y) ? y : x; }
                           ^
/usr/include/ITK-4.9/vnl/vnl_math.h:574:27: note: candidate: double vnl_math_min(double, double)
 inline double             vnl_math_min(double x, double y)                         { return (x > y) ? y : x; }
                           ^
/usr/include/ITK-4.9/vnl/vnl_math.h:575:27: note: candidate: long double vnl_math_min(long double, long double)
 inline long double        vnl_math_min(long double x, long double y)               { return (x > y) ? y : x; }
                           ^
In file included from /PKGBUILDDIR/src/Components/Optimizers/AdaptiveStochasticGradientDescent/elxAdaptiveStochasticGradientDescent.h:430:0,
                 from /PKGBUILDDIR/src/Components/Optimizers/AdaptiveStochasticGradientDescent/elxAdaptiveStochasticGradientDescent.cxx:19:
/PKGBUILDDIR/src/Components/Optimizers/AdaptiveStochasticGradientDescent/elxAdaptiveStochasticGradientDescent.hxx: In instantiation of 'void elastix::AdaptiveStochasticGradientDescent<TElastix>::BeforeEachResolution() [with TElastix = elastix::ElastixTemplate<itk::Image<float, 3u>, itk::Image<float, 3u> >]':
/PKGBUILDDIR/src/Components/Optimizers/AdaptiveStochasticGradientDescent/elxAdaptiveStochasticGradientDescent.cxx:21:53:   required from here
/PKGBUILDDIR/src/Components/Optimizers/AdaptiveStochasticGradientDescent/elxAdaptiveStochasticGradientDescent.hxx:193:45: error: call of overloaded 'vnl_math_min(const unsigned int&, int)' is ambiguous
     const unsigned int fixdim = vnl_math_min( this->GetElastix()->FixedDimension, 2 );
                                             ^
r5140 | kmarstal | 2015-11-16 09:38:55 +0000 (Mon, 16 Nov 2015) | 1 line
r5139 | dpshamonin | 2015-11-13 12:42:05 +0000 (Fri, 13 Nov 2015) | 1 line
fix compilation with std c++11.patch | (download)

src/Components/Metrics/AdvancedMattesMutualInformation/itkParzenWindowMutualInformationImageToImageMetric.hxx | 6 3 + 3 - 0 !
src/Core/Install/elxBaseComponent.h | 6 5 + 1 - 0 !
2 files changed, 8 insertions(+), 4 deletions(-)

 [patch] comp: override was used, but base class did not define it.

When using itkTypeMacro in all elx classes.

git-svn-id: https://svn.bigr.nl/elastix/trunkpublic@5392 4d348492-3962-11de-aa85-65a2020054a3

itk4.10.patch | (download)

src/Core/Kernel/elxElastixMain.cxx | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 fix compilation with itk 4.10