Minor fixes for windows compilation

diff --git a/filters/clitkBinarizeImageGenericFilter.txx b/filters/clitkBinarizeImageGenericFilter.txx
index 2076e71e4204527e347aae4b268ca36b6ebaac4b..e7865bd136e6fa64290587e550622f40dc3fc4fd 100644 (file)
--- a/filters/clitkBinarizeImageGenericFilter.txx
+++ b/filters/clitkBinarizeImageGenericFilter.txx
@@ -32,7 +32,6 @@
 #include "itkMaskImageFilter.h"
 #include "itkMaskNegatedImageFilter.h"
 #include <clitkCommon.h>
-#include <tiff.h>
 
 namespace clitk
 {
@@ -57,7 +56,6 @@ namespace clitk
     ADD_IMAGE_TYPE(Dim, short);
     ADD_IMAGE_TYPE(Dim, ushort);
     ADD_IMAGE_TYPE(Dim, int);
-    ADD_IMAGE_TYPE(Dim, uint16);
     ADD_IMAGE_TYPE(Dim, float);
     ADD_IMAGE_TYPE(Dim, double);
   }

diff --git a/filters/clitkFooImageGenericFilter.txx b/filters/clitkFooImageGenericFilter.txx
index b2c9c293a2ad23ce1818794512907b246076dd10..e8a47970a00e25a1bb3ff9a361130694617d0430 100644 (file)
--- a/filters/clitkFooImageGenericFilter.txx
+++ b/filters/clitkFooImageGenericFilter.txx
@@ -32,7 +32,6 @@
 #include "itkMaskImageFilter.h"
 #include "itkMaskNegatedImageFilter.h"
 #include <clitkCommon.h>
-#include <tiff.h>
 
 namespace clitk
 {

diff --git a/filters/clitkImageArithmGenericFilter.txx b/filters/clitkImageArithmGenericFilter.txx
index 60ddc084877ecca8c98607cc8da6e5878e47b505..5d7f6e0f0235d32e24d28c0b6cc5cf5f98b804f4 100644 (file)
--- a/filters/clitkImageArithmGenericFilter.txx
+++ b/filters/clitkImageArithmGenericFilter.txx
@@ -99,7 +99,6 @@ namespace clitk
   void ImageArithmGenericFilter<args_info_type>::UpdateWithInputImageType() {
     // Read input1
     typename ImageType::Pointer input1 = this->template GetInput<ImageType>(0);
-    typename ImageType::PixelType PixelType;
 
     // Set input image iterator
     typedef itk::ImageRegionIterator<ImageType> IteratorType;
@@ -117,7 +116,7 @@ namespace clitk
     }
 
     // Check if overwrite and outputisfloat and pixeltype is not float -> do not overwrite
-    if (mOverwriteInputImage && mOutputIsFloat && (typeid(PixelType) != typeid(float))) {
+    if (mOverwriteInputImage && mOutputIsFloat && (typeid(ImageType::PixelType) != typeid(float))) {
       // std::cerr << "Warning. Could not use both mOverwriteInputImage and mOutputIsFloat, because input is " 
       //                     << typeid(PixelType).name()
       //                     << std::endl;
@@ -213,7 +212,7 @@ namespace clitk
       break;
     case 5: // Absolute difference
       while (!ito.IsAtEnd()) {
-        ito.Set(PixelTypeDownCast<double, PixelType>(fabs(it2.Get()-it1.Get()))); 
+        ito.Set(PixelTypeDownCast<double, PixelType>(fabs((double)it2.Get()-(double)it1.Get()))); 
         ++it1; ++it2; ++ito;
       }
       break;

diff --git a/filters/clitkMedianImageGenericFilter.txx b/filters/clitkMedianImageGenericFilter.txx
index 29a316cf7b0002199f582bc2263aa9db0a240396..81ef36eacf8c82284ea0b35b42b371bed477a845 100644 (file)
--- a/filters/clitkMedianImageGenericFilter.txx
+++ b/filters/clitkMedianImageGenericFilter.txx
@@ -84,7 +84,7 @@ namespace clitk
  // Main filter
    
      typedef itk::Image<uchar, InputImageType::ImageDimension> OutputImageType;
-     class  InputImageType::SizeType indexRadius;
+     typename InputImageType::SizeType indexRadius;
 
     // Filter
     typedef itk::MedianImageFilter<InputImageType, OutputImageType> MedianImageFilterType;