Merge pull request #2 from joelthelion/master

ITKv4 compatibility

Author: thewtex

Source/CMakeLists.txt

@@ -1,3 +1,4 @@
+cmake_minimum_required(VERSION 2.8)
 INCLUDE(${CMAKE_SOURCE_DIR}/IJMacros.txt)
 
 #Change PROJECT_NAME to the name of your project
@@ -14,8 +15,8 @@ INCLUDE(Dart)
 #
 # The packages can be specified with a version number, for example:
 #
-# ITK 2.8.1
 # ITK 3.2.0
+# ITK 4.6.0
 #
 # If no version is specified, the most recent release of the package
 # will be used.
@@ -32,8 +33,7 @@ ENDFOREACH(Package)
 #Set any libraries that your project depends on.
 #examples: ITKCommon, VTKRendering, etc
 SET(Libraries
-ITKCommon
-ITKIO
+	${ITK_LIBRARIES}
 )
 
 #the following block of code is an example of how to build an executable in

Source/ImageCompare.cxx

@@ -7,7 +7,7 @@
 #include "itkImageFileWriter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "itkExtractImageFilter.h"
-#include "itkDifferenceImageFilter.h"
+#include "itkTestingComparisonImageFilter.h"
 
 using namespace std;
 
@@ -136,7 +136,7 @@ int RegressionTestImage (const char *testImageFilename, const char *baselineImag
     }
 
   // Now compare the two images
-  typedef itk::DifferenceImageFilter<ImageType,ImageType> DiffType;
+  typedef itk::Testing::ComparisonImageFilter<ImageType,ImageType> DiffType;
   DiffType::Pointer diff = DiffType::New();
     diff->SetValidInput(baselineReader->GetOutput());
     diff->SetTestInput(testReader->GetOutput());
@@ -184,7 +184,7 @@ int RegressionTestImage (const char *testImageFilename, const char *baselineImag
       std::cout << status;
       std::cout <<  "</DartMeasurement>" << std::endl;
 
-      ::itk::OStringStream diffName;
+      std::ostringstream diffName;
         diffName << testImageFilename << ".diff.png";
       try
         {
@@ -209,7 +209,7 @@ int RegressionTestImage (const char *testImageFilename, const char *baselineImag
       std::cout << diffName.str();
       std::cout << "</DartMeasurementFile>" << std::endl;
       }
-    ::itk::OStringStream baseName;
+    std::ostringstream baseName;
     baseName << testImageFilename << ".base.png";
     try
       {
@@ -234,7 +234,7 @@ int RegressionTestImage (const char *testImageFilename, const char *baselineImag
     std::cout << baseName.str();
     std::cout << "</DartMeasurementFile>" << std::endl;
 
-    ::itk::OStringStream testName;
+    std::ostringstream testName;
     testName << testImageFilename << ".test.png";
     try
       {

Source/ImageCopy.cxx

@@ -45,7 +45,7 @@ int main(int argc, char **argv)
 
   writer->SetInput(baselineReader->GetOutput());
 
-  ::itk::OStringStream baseName;
+  std::ostringstream baseName;
 
   baseName << argv[1] << ".base.png";