BUG: Use ITK_TEMPLATE_EXPORT with templated classes

Author: thewtex

include/itkArrivalFunctionToPathFilter.h

@@ -38,8 +38,8 @@ namespace itk
  *
  */
 
-template <class TFilter>
-class ArrivalFunctionToPathCommand : public itk::Command
+template <typename TFilter>
+class ITK_TEMPLATE_EXPORT ArrivalFunctionToPathCommand : public itk::Command
 {
 public:
   ITK_DISALLOW_COPY_AND_ASSIGN(ArrivalFunctionToPathCommand);
@@ -137,9 +137,9 @@ class ArrivalFunctionToPathCommand : public itk::Command
  *
  * \ingroup MinimalPathExtraction
  */
-template <class TInputImage,
-          class TOutputPath = PolyLineParametricPath<TInputImage::ImageDimension> >
-class ITK_EXPORT ArrivalFunctionToPathFilter :
+template <typename TInputImage,
+          typename TOutputPath = PolyLineParametricPath<TInputImage::ImageDimension> >
+class ITK_TEMPLATE_EXPORT ArrivalFunctionToPathFilter :
     public ImageToPathFilter<TInputImage,TOutputPath>
 {
 public:
@@ -220,7 +220,7 @@ class ITK_EXPORT ArrivalFunctionToPathFilter :
   void GenerateInputRequestedRegion() override;
 
   /** Implemention of algorithm */
-  void GenerateData(void) override;
+  void GenerateData() override;
 
   /** Get the arrival function from which to extract the path. */
   virtual unsigned int GetNumberOfPathsToExtract( ) const;

include/itkArrivalFunctionToPathFilter.hxx

@@ -116,7 +116,7 @@ ArrivalFunctionToPathFilter<TInputImage,TOutputPath>
 template <typename TInputImage, typename TOutputPath>
 void
 ArrivalFunctionToPathFilter<TInputImage,TOutputPath>
-::GenerateData( void )
+::GenerateData( )
 {
   // Get the input
   InputImagePointer input = const_cast< InputImageType * >( this->GetInput() );

include/itkPhysicalCentralDifferenceImageFunction.h

@@ -38,10 +38,8 @@ namespace itk
  *
  * \ingroup MinimalPathExtraction
  */
-template <
-  class TInputImage,
-  class TCoordRep = float >
-class ITK_EXPORT PhysicalCentralDifferenceImageFunction :
+template < typename TInputImage, typename TCoordRep = float >
+class ITK_TEMPLATE_EXPORT PhysicalCentralDifferenceImageFunction :
   public ImageFunction< TInputImage,
                         CovariantVector<double, TInputImage::ImageDimension>,
                         TCoordRep >

include/itkSingleImageCostFunction.h

@@ -49,7 +49,7 @@ namespace itk
  * \ingroup MinimalPathExtraction
  */
 template <class TImage>
-class ITK_EXPORT SingleImageCostFunction :
+class ITK_TEMPLATE_EXPORT SingleImageCostFunction :
     public SingleValuedCostFunction
 {
 public:

include/itkSpeedFunctionPathInformation.h

@@ -49,7 +49,7 @@ namespace itk
  * \ingroup MinimalPathExtraction
  */
 template <typename TPoint>
-class SpeedFunctionPathInformation :
+class ITK_TEMPLATE_EXPORT SpeedFunctionPathInformation :
   public LightObject
 {
 public:

include/itkSpeedFunctionToPathFilter.h

@@ -66,7 +66,7 @@ namespace itk
  */
 template <class TInputImage,
           class TOutputPath = PolyLineParametricPath<TInputImage::ImageDimension> >
-class ITK_EXPORT SpeedFunctionToPathFilter :
+class ITK_TEMPLATE_EXPORT SpeedFunctionToPathFilter :
     public ArrivalFunctionToPathFilter<TInputImage,TOutputPath>
 {
 public:

test/MinimalPathTest.h

@@ -406,6 +406,8 @@ int Test_SpeedToPath_RegularStepGradientDescent_ND(int argc, char* argv[])
         pathFilter->Update( );
         time.Stop( );
         std::cout << std::setprecision(3) << "Path computed in: " << time.GetMean() << " seconds" << std::endl;
+        std::cout << "Number of paths: " << pathFilter->GetNumberOfOutputs() << std::endl;
+        std::cout << "Number of path 0 vertices: " << pathFilter->GetOutput(0)->GetVertexList()->Size() << std::endl;
 
         // Allocate output image
         typename OutputImageType::Pointer output = OutputImageType::New();