Passage de certains exemples de itkImage a otbImage

Code/Common/otbExtractROI.h

@@ -13,7 +13,7 @@
 #define __otbExtractROI_h
 
 #include "otbExtractROIBase.h"
-#include "itkImage.h"
+#include "otbImage.h"
 #include "itkMacro.h"
 
 namespace otb
@@ -24,17 +24,17 @@ namespace otb
  *
  * Le Pixel peut etre de type simple ou alors un itk::RGBPixel, etc.
  * \note Ces classe est paramtre par le type de pixel des images d'entre et de sortie. Les images manipules dans cette classe 
- * sont de type "itk::Image".
+ * sont de type "otb::Image".
  *
  */
 template <class TInputPixel, class TOutputPixel>
 class ITK_EXPORT ExtractROI:
-    public ExtractROIBase<itk::Image<TInputPixel,2> , itk::Image<TOutputPixel,2> >
+    public ExtractROIBase<otb::Image<TInputPixel,2> , otb::Image<TOutputPixel,2> >
 {
 public:
   /** Standard class typedefs. */
   typedef ExtractROI         Self;
-  typedef ExtractROIBase<itk::Image<TInputPixel,2> , itk::Image<TOutputPixel,2> >  Superclass;
+  typedef ExtractROIBase<otb::Image<TInputPixel,2> , otb::Image<TOutputPixel,2> >  Superclass;
   typedef itk::SmartPointer<Self>  Pointer;
   typedef itk::SmartPointer<const Self>  ConstPointer;
 

Code/FeatureExtraction/otbComplexMomentImageFunction.txx

@@ -84,7 +84,7 @@ ComplexMomentImageFunction<TInput,TOutput,TCoordRep>
        kernelSize.Fill( this->GetNeighborhoodRadius() );
      }  
 
-  itk::ConstNeighborhoodIterator<TInput>
+   itk::ConstNeighborhoodIterator<TInput>
     it(kernelSize, this->GetInputImage(), this->GetInputImage()->GetBufferedRegion());
 
 

Code/FeatureExtraction/otbLineDetectorImageFilterBase.h

@@ -14,11 +14,11 @@
 #include "itkNearestNeighborInterpolateImageFunction.h"
 #include "itkLinearInterpolateImageFunction.h"
 #include "itkImageToImageFilter.h"
-#include "itkImage.h"
+#include "otbImage.h"
 #include "itkNumericTraits.h"
 
-#define MIN(_A,_B) ((_A) < (_B) ? (_A) : (_B))
-#define MAX(_A,_B) ((_A) > (_B) ? (_A) : (_B))  
+#define MINI(_A,_B) ((_A) < (_B) ? (_A) : (_B))
+#define MAXI(_A,_B) ((_A) > (_B) ? (_A) : (_B))  
 #define ROTATION(_x,_y,_theta,_xout,_yout) \
     (_xout) = (_x)*cos(_theta) - (_y)*sin(_theta); \
     (_yout) = (_x)*sin(_theta) + (_y)*cos(_theta)
@@ -74,7 +74,7 @@ public:
   /** Return the name of the class. */
   itkTypeMacro(LineDetectorImageFilterBase, itk::ImageToImageFilter);
 
-  /** Typedefs to describe and access Interpolator */
+  /** Typedefs to describe and access Interpolator */
   typedef typename InterpolatorType::Pointer InterpolatorPointer;
   typedef typename InterpolatorType::CoordRepType CoordRepType;
   

Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx

@@ -51,8 +51,8 @@ void LineDetectorImageFilterBase<TInputImage, TOutputImage, InterpolatorType>::G
   Superclass::GenerateInputRequestedRegion();
   
   // get pointers to the input and output
-  typename Superclass::InputImagePointer inputPtr   =  const_cast< TInputImage * >( this->GetInput() );
-  typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
+  typename InputImageType::Pointer inputPtr   =  const_cast< TInputImage * >( this->GetInput() );
+  typename OutputImageType::Pointer outputPtr = this->GetOutput();
   
   if ( !inputPtr || !outputPtr )
     {

Code/FeatureExtraction/otbLocalHoughFilter.h

@@ -78,7 +78,7 @@ public:
   typedef TInputImage InputImageType;
   
   //------------------------------------------------------------
-   typedef  unsigned char    OutputPixelType;
+   typedef  unsigned char    OutputPixelType;
    typedef  itk::Image< OutputPixelType, 2 > OutputImageType;
    //-----------------------------------------------  
 

Code/FeatureExtraction/otbLocalHoughFilter.txx

@@ -15,7 +15,7 @@
 #include "otbLocalHoughFilter.h"
 
 #include "otbImageFileWriter.h"
-#include "itkImage.h"
+#include "otbImage.h"
 
 namespace otb
 {

Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.h

@@ -12,11 +12,11 @@
 #define __otbTouziEdgeDetectorImageFilter_h
 
 #include "itkImageToImageFilter.h"
-#include "itkImage.h"
+#include "otbImage.h"
 #include "itkNumericTraits.h"
 
-#define MIN(_A,_B) ((_A) < (_B) ? (_A) : (_B))   
-#define MAX(_A,_B) ((_A) > (_B) ? (_A) : (_B))
+#define MINI(_A,_B) ((_A) < (_B) ? (_A) : (_B))   
+#define MAXI(_A,_B) ((_A) > (_B) ? (_A) : (_B))
 
 
 namespace otb

Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.txx

@@ -283,12 +283,12 @@ std::cout<< cpt << std::endl;
      	
         // Calculation of the intensity of the contour
         if (( M1 != 0 ) && (M2 != 0)) 
-          R_theta[dir] = static_cast<double>( 1 - MIN( (M1/M2), (M2/M1) ) );
+          R_theta[dir] = static_cast<double>( 1 - MINI( (M1/M2), (M2/M1) ) );
         else
 	  R_theta[dir] = 0.;
 	  
 	// Determination of the maximum intensity of the contour
-        R_contour = static_cast<double>( MAX( R_contour, R_theta[dir] ) );
+        R_contour = static_cast<double>( MAXI( R_contour, R_theta[dir] ) );
 	 
         // Determination of the sign of contour
         if ( M2 > M1 ) 

Code/IO/otbImageBase.h

@@ -101,6 +101,7 @@ public:
   void PrintSelf(std::ostream& os, Indent indent, const MetaDataDictionaryType & dict) const;
                  
 
+protected:  
   ImageBase();
   virtual ~ImageBase(){};
     

Code/Visu/otbImageViewer.txx

@@ -5,8 +5,8 @@
 
 #include "otbImageViewer.h"
 
-#define MAX(_A,_B) ((_A) > (_B) ? (_A) : (_B))
-#define MIN(_A,_B) ((_A) < (_B) ? (_A) : (_B))
+#define MAXI(_A,_B) ((_A) > (_B) ? (_A) : (_B))
+#define MINI(_A,_B) ((_A) < (_B) ? (_A) : (_B))
 
 
 
@@ -199,10 +199,10 @@ ImageViewer<TPixel>
         //Si pas besoin de Scroll, alors on dit que l'image Principal n'est pas "resizable" !!!
         SizeType lInputImageSize = m_InputImage->GetLargestPossibleRegion().GetSize();
         // Si la dimension Min de l'image est plus grande que la fenetre Principal, alors on cre la fenetre Scroll
-        if ( MIN(lInputImageSize[0], lInputImageSize[1]) > MAX( m_PrincipalView->sizeX(), m_PrincipalView->sizeY() ) ) 
+        if ( MINI(lInputImageSize[0], lInputImageSize[1]) > MAXI( m_PrincipalView->sizeX(), m_PrincipalView->sizeY() ) ) 
         {
                 //La taille
-                lShrinkFactors = (double)(MAX(lInputImageSize[0], lInputImageSize[1])) / (double)(MAX( m_ScrollView->sizeX(), m_ScrollView->sizeY() )) ;
+                lShrinkFactors = (double)(MAXI(lInputImageSize[0], lInputImageSize[1])) / (double)(MAXI( m_ScrollView->sizeX(), m_ScrollView->sizeY() )) ;
                 if( lShrinkFactors < 1. )
                 {
                         lSousEchWindow = false;

Examples/DataRepresentation/Image/CMakeLists.txt

@@ -4,16 +4,16 @@ INCLUDE_REGULAR_EXPRESSION("^.*$")
 SET(TEMP ${ITK_BINARY_DIR}/Testing/Temporary)
 
 ADD_EXECUTABLE(Image1 Image1.cxx )
-TARGET_LINK_LIBRARIES(Image1 ITKCommon)
+TARGET_LINK_LIBRARIES(Image1 OTBCommon ITKCommon OTBIO ITKIO)
 
 ADD_EXECUTABLE(Image2 Image2.cxx )
 TARGET_LINK_LIBRARIES(Image2 OTBCommon ITKCommon OTBIO ITKIO)
 
 ADD_EXECUTABLE(Image3 Image3.cxx )
-TARGET_LINK_LIBRARIES(Image3 OTBCommon ITKCommon)
+TARGET_LINK_LIBRARIES(Image3 OTBCommon ITKCommon OTBIO ITKIO)
 
 ADD_EXECUTABLE(Image4 Image4.cxx )
-TARGET_LINK_LIBRARIES(Image4 OTBCommon ITKCommon)
+TARGET_LINK_LIBRARIES(Image4 OTBCommon ITKCommon OTBIO ITKIO)
 
 ADD_EXECUTABLE(Image5 Image5.cxx )
 TARGET_LINK_LIBRARIES(Image5 OTBCommon ITKCommon OTBIO ITKIO)
@@ -22,7 +22,7 @@ ADD_EXECUTABLE(RGBImage RGBImage.cxx )
 TARGET_LINK_LIBRARIES(RGBImage OTBCommon OTBIO ITKCommon ITKIO) 
 
 ADD_EXECUTABLE(VectorImage VectorImage.cxx )
-TARGET_LINK_LIBRARIES(VectorImage ITKCommon)
+TARGET_LINK_LIBRARIES(VectorImage OTBCommon ITKCommon OTBIO ITKIO)
 
 #ADD_EXECUTABLE(ImageAdaptor1 ImageAdaptor1.cxx )
 #TARGET_LINK_LIBRARIES(ImageAdaptor1 ITKCommon ITKIO)

Examples/DataRepresentation/Image/Image1.cxx

@@ -33,7 +33,7 @@
 
 
 // Software Guide : BeginCodeSnippet
-#include "itkImage.h"
+#include "otbImage.h"
 // Software Guide : EndCodeSnippet
 
 
@@ -51,7 +51,7 @@ int main(int, char *[])
   // Software Guide : EndLatex 
   //
   // Software Guide : BeginCodeSnippet 
-  typedef itk::Image< unsigned short, 2 > ImageType;
+  typedef otb::Image< unsigned short, 2 > ImageType;
   // Software Guide : EndCodeSnippet 
 
   

Examples/DataRepresentation/Image/Image2.cxx

@@ -18,7 +18,7 @@
 #pragma warning ( disable : 4786 )
 #endif
 
-#include "itkImage.h"
+#include "otbImage.h"
 
 //  Software Guide : BeginLatex
 //
@@ -44,7 +44,7 @@ int main( int , char * argv[])
   typedef unsigned char          PixelType;
   const unsigned int             Dimension = 2;
 
-  typedef itk::Image< PixelType, Dimension >   ImageType;
+  typedef otb::Image< PixelType, Dimension >   ImageType;
   // Software Guide : EndCodeSnippet
 
 

Examples/DataRepresentation/Image/Image3.cxx

@@ -33,12 +33,12 @@
 // Software Guide : EndLatex 
 
 
-#include "itkImage.h"
+#include "otbImage.h"
 
 int main(int, char *[])
 {
   // First the image type should be declared
-  typedef itk::Image< unsigned short, 2 > ImageType;
+  typedef otb::Image< unsigned short, 2 > ImageType;
 
   // Then the image object can be created
   ImageType::Pointer image = ImageType::New();

Examples/DataRepresentation/Image/Image4.cxx

@@ -38,7 +38,7 @@
 //
 // \begin{figure} \center
 // \includegraphics[width=\textwidth]{ImageOriginAndSpacing.eps}
-// \itkcaption[ITK Image Geometrical Concepts]{Geometrical concepts associated
+// \itkcaption[OTB Image Geometrical Concepts]{Geometrical concepts associated
 // with the OTB image.}
 // \label{fig:ImageOriginAndSpacing}
 // \end{figure}
@@ -61,12 +61,12 @@
 // Software Guide : EndLatex 
 
 
-#include "itkImage.h"
+#include "otbImage.h"
 #include "itkPoint.h"
 
 int main(int, char *[])
 {
-  typedef itk::Image< unsigned short, 2 > ImageType;
+  typedef otb::Image< unsigned short, 2 > ImageType;
 
   ImageType::Pointer image = ImageType::New();
 

Examples/DataRepresentation/Image/Image5.cxx

@@ -43,7 +43,7 @@
 
 
 // Software Guide : BeginCodeSnippet
-#include "itkImage.h"
+#include "otbImage.h"
 #include "itkImportImageFilter.h"
 // Software Guide : EndCodeSnippet
 
@@ -69,7 +69,7 @@ int main(int argc, char * argv[])
   // Software Guide : BeginCodeSnippet 
   typedef unsigned char   PixelType;
   const unsigned int Dimension = 2;
-  typedef itk::Image< PixelType, Dimension > ImageType;
+  typedef otb::Image< PixelType, Dimension > ImageType;
   // Software Guide : EndCodeSnippet 
 
   
@@ -250,7 +250,7 @@ int main(int argc, char * argv[])
   writer->SetFileName( argv[1] );
 
   // Software Guide : BeginCodeSnippet
-  writer->SetInput(  importFilter->GetOutput()  );
+  writer->SetInput(  dynamic_cast<ImageType*>(importFilter->GetOutput())  );
   // Software Guide : EndCodeSnippet
 
 

Examples/DataRepresentation/Image/RGBImage.cxx

@@ -18,7 +18,7 @@
 #pragma warning ( disable : 4786 )
 #endif
 
-#include "itkImage.h"
+#include "otbImage.h"
 #include "otbImageFileReader.h"
 
 //  Software Guide : BeginLatex
@@ -69,7 +69,7 @@ int main( int , char * argv[] )
   // Software Guide : EndLatex 
 
   // Software Guide : BeginCodeSnippet
-  typedef itk::Image< PixelType, 2 >   ImageType;
+  typedef otb::Image< PixelType, 2 >   ImageType;
   // Software Guide : EndCodeSnippet
 
 
@@ -106,7 +106,7 @@ int main( int , char * argv[] )
   // Access to the color components of the pixels can now be performed using
   // the methods provided by the RGBPixel class.
   //
-  // \index{itk::Image!GetPixel()}
+  // \index{otb::Image!GetPixel()}
   // \index{itk::RGBPixel!GetRed()}
   // \index{itk::RGBPixel!GetGreen()}
   // \index{itk::RGBPixel!GetBlue()}

Examples/DataRepresentation/Image/VectorImage.cxx

@@ -47,7 +47,7 @@
 // Software Guide : EndLatex 
 
 // Software Guide : BeginCodeSnippet
-#include "itkVectorImage.h"
+#include "otbVectorImage.h"
 // Software Guide : EndCodeSnippet
 
 
@@ -61,13 +61,13 @@ int main(int, char *[])
   // this example, 
   // we want to represent Pléiades images which have 4 bands.
   //
-  // \index{itk::VectorImage!Instantiation}
+  // \index{otb::VectorImage!Instantiation}
   //
   // Software Guide : EndLatex 
 
   // Software Guide : BeginCodeSnippet
   typedef unsigned char                 PixelType;
-  typedef itk::VectorImage< PixelType, 2 >    ImageType;
+  typedef otb::VectorImage< PixelType, 2 >    ImageType;
   // Software Guide : EndCodeSnippet
 
   // Then the image object can be created

Examples/DataRepresentation/Path/PolyLineParametricPath1.cxx

@@ -34,7 +34,7 @@
 // Software Guide : EndLatex 
 
 
-#include "itkImage.h"
+#include "otbImage.h"
 #include "otbImageFileReader.h"
 
 // Software Guide : BeginCodeSnippet
@@ -61,7 +61,7 @@ int main(int argc, char * argv [] )
   // Software Guide : BeginCodeSnippet 
   const unsigned int Dimension = 2;
 
-  typedef itk::Image< unsigned char, Dimension > ImageType;
+  typedef otb::Image< unsigned char, Dimension > ImageType;
 
   typedef itk::PolyLineParametricPath< Dimension > PathType;
   // Software Guide : EndCodeSnippet 

Examples/FeatureExtraction/AlignmentsExample.cxx

@@ -46,8 +46,8 @@
 #include "otbDrawPathFilter.h"
 // Software Guide : EndCodeSnippet
 
-#include "itkImage.h"
-#include "itkImageFileWriter.h"
+#include "otbImage.h"
+#include "otbImageFileWriter.h"
 
 
 #include "otbImageFileReader.h"
@@ -74,11 +74,11 @@ int main( int argc, char ** argv )
 
   const   unsigned int        	                        Dimension = 2;
 
-  typedef itk::Image< InputPixelType,  Dimension >	InputImageType;
-  typedef itk::Image< OutputPixelType, Dimension >        OutputImageType;
+  typedef otb::Image< InputPixelType,  Dimension >	InputImageType;
+  typedef otb::Image< OutputPixelType, Dimension >        OutputImageType;
 
   typedef otb::ImageFileReader< InputImageType  >         ReaderType;
-  typedef itk::ImageFileWriter< OutputImageType >         WriterType;
+  typedef otb::ImageFileWriter< OutputImageType >         WriterType;
 
   ReaderType::Pointer reader = ReaderType::New();
   WriterType::Pointer writer = WriterType::New();