REFAC: ImageSeriesFileReader
authorGregoire Mercier <gregoire.mercier@telecom-bretagne.eu>
Thu Jul 02 14:31:03 2009 +0200 (14 months ago)
changeset 586943be7c19f9bf
parent 5855 7dbc2a0ddc4b
child 5870 d2975b977d89
REFAC: ImageSeriesFileReader
Code/IO/otbImageSeriesFileReader.h
     1.1 --- a/Code/IO/otbImageSeriesFileReader.h	Tue Jun 30 10:49:36 2009 +0200
     1.2 +++ b/Code/IO/otbImageSeriesFileReader.h	Thu Jul 02 14:31:03 2009 +0200
     1.3 @@ -48,97 +48,97 @@
     1.4  class ITK_EXPORT ImageSeriesFileReader
     1.5          : public ImageSeriesFileReaderBase< TImage, TInternalImage >
     1.6  {
     1.7 -  public:
     1.8 -    /** Standart typedefs */
     1.9 -    typedef ImageSeriesFileReader Self;
    1.10 -    typedef ImageSeriesFileReaderBase< TImage, TInternalImage > Superclass;
    1.11 -    typedef itk::SmartPointer<Self> Pointer;
    1.12 -    typedef itk::SmartPointer<const Self> ConstPointer;
    1.13 +public:
    1.14 +  /** Standart typedefs */
    1.15 +  typedef ImageSeriesFileReader Self;
    1.16 +  typedef ImageSeriesFileReaderBase< TImage, TInternalImage > Superclass;
    1.17 +  typedef itk::SmartPointer<Self> Pointer;
    1.18 +  typedef itk::SmartPointer<const Self> ConstPointer;
    1.19  
    1.20 -    /** Creation through object factory macro */
    1.21 -    itkNewMacro(Self);
    1.22 -    /** Runtime informations macro */
    1.23 -    itkTypeMacro(ImageSeriesFileReader,ImageSeriesFileReaderBase);
    1.24 +  /** Creation through object factory macro */
    1.25 +  itkNewMacro(Self);
    1.26 +  /** Runtime informations macro */
    1.27 +  itkTypeMacro(ImageSeriesFileReader,ImageSeriesFileReaderBase);
    1.28  
    1.29 -    typedef typename Superclass::OutputImageType        OutputImageType;
    1.30 -    typedef typename Superclass::OutputImagePointerType OutputImagePointerType;
    1.31 -    typedef typename Superclass::PixelType              PixelType;
    1.32 -    typedef typename Superclass::ValueType              ValueType;
    1.33 -    typedef typename Superclass::IndexType              IndexType;
    1.34 -    typedef typename Superclass::SizeType               SizeType;
    1.35 -    typedef typename Superclass::RegionType             RegionType;
    1.36 +  typedef typename Superclass::OutputImageType        OutputImageType;
    1.37 +  typedef typename Superclass::OutputImagePointerType OutputImagePointerType;
    1.38 +  typedef typename Superclass::PixelType              PixelType;
    1.39 +  typedef typename Superclass::ValueType              ValueType;
    1.40 +  typedef typename Superclass::IndexType              IndexType;
    1.41 +  typedef typename Superclass::SizeType               SizeType;
    1.42 +  typedef typename Superclass::RegionType             RegionType;
    1.43  
    1.44 -    typedef typename Superclass::OutputImageListType             OutputImageListType;
    1.45 -    typedef typename Superclass::OutputImageListPointerType      OutputImageListPointerType;
    1.46 -    typedef typename Superclass::OutputImageListConstPointerType OutputImageListConstPointerType;
    1.47 +  typedef typename Superclass::OutputImageListType             OutputImageListType;
    1.48 +  typedef typename Superclass::OutputImageListPointerType      OutputImageListPointerType;
    1.49 +  typedef typename Superclass::OutputImageListConstPointerType OutputImageListConstPointerType;
    1.50  
    1.51 -    typedef typename Superclass::InternalImageType               InternalImageType;
    1.52 -    typedef typename Superclass::InternalImagePointerType        InternalImagePointerType;
    1.53 -    typedef typename Superclass::InternalPixelType               InternalPixelType;
    1.54 -    typedef typename Superclass::InternalValueType               InternalValueType;
    1.55 -    typedef typename Superclass::InternalIndexType               InternalIndexType;
    1.56 -    typedef typename Superclass::InternalSizeType                InternalSizeType;
    1.57 -    typedef typename Superclass::InternalRegionType              InternalRegionType;
    1.58 +  typedef typename Superclass::InternalImageType               InternalImageType;
    1.59 +  typedef typename Superclass::InternalImagePointerType        InternalImagePointerType;
    1.60 +  typedef typename Superclass::InternalPixelType               InternalPixelType;
    1.61 +  typedef typename Superclass::InternalValueType               InternalValueType;
    1.62 +  typedef typename Superclass::InternalIndexType               InternalIndexType;
    1.63 +  typedef typename Superclass::InternalSizeType                InternalSizeType;
    1.64 +  typedef typename Superclass::InternalRegionType              InternalRegionType;
    1.65  
    1.66 -    typedef typename Superclass::ReaderType ReaderType;
    1.67 -    typedef typename Superclass::ReaderType ReaderPointerType;
    1.68 +  typedef typename Superclass::ReaderType ReaderType;
    1.69 +  typedef typename Superclass::ReaderType ReaderPointerType;
    1.70  
    1.71 -    typedef typename Superclass::ReaderListType        ReaderListType;
    1.72 -    typedef typename Superclass::ReaderListPointerType ReaderListPointerType;
    1.73 +  typedef typename Superclass::ReaderListType        ReaderListType;
    1.74 +  typedef typename Superclass::ReaderListPointerType ReaderListPointerType;
    1.75  
    1.76 -    /** This is a generic template definition of the ROI extraction procedure.
    1.77 -     * In fact, it will be specialised with:
    1.78 -     * - MultiChannelExtractROI if TImage is a VectorImage
    1.79 -     * - MultiToMonoChannelExtractROI if TImage is an Image and TInteranalImage is a VectorImage
    1.80 -     * - ExtractROI if TImage and TInternalImage are of Image type.
    1.81 -     */
    1.82 -    // typedef MultiChannelExtractROI< InternalPixelType, PixelType > ExtractSelectionType;
    1.83 -    // typedef MultiToMonoChannelExtractROI< InternalPixelType, PixelType > ExtractSelectionType;
    1.84 -    // typedef ExtractROI< InternalPixelType, PixelType > ExtractSelectionType;
    1.85 -    typedef itk::ImageToImageFilter< InternalImageType, OutputImageType > ExtractSelectionType;
    1.86 -    typedef typename ExtractSelectionType::Pointer ExtractSelectionPointerType;
    1.87 +  /** This is a generic template definition of the ROI extraction procedure.
    1.88 +   * In fact, it will be specialised with:
    1.89 +   * - MultiChannelExtractROI if TImage is a VectorImage
    1.90 +   * - MultiToMonoChannelExtractROI if TImage is an Image and TInteranalImage is a VectorImage
    1.91 +   * - ExtractROI if TImage and TInternalImage are of Image type.
    1.92 +   */
    1.93 +  // typedef MultiChannelExtractROI< InternalPixelType, PixelType > ExtractSelectionType;
    1.94 +  // typedef MultiToMonoChannelExtractROI< InternalPixelType, PixelType > ExtractSelectionType;
    1.95 +  // typedef ExtractROI< InternalPixelType, PixelType > ExtractSelectionType;
    1.96 +  typedef itk::ImageToImageFilter< InternalImageType, OutputImageType > ExtractSelectionType;
    1.97 +  typedef typename ExtractSelectionType::Pointer ExtractSelectionPointerType;
    1.98  
    1.99 -    typedef ObjectList< ExtractSelectionType > ExtractSelectionListType;
   1.100 -    typedef typename ExtractSelectionListType::Pointer ExtractSelectionListPointerType;
   1.101 +  typedef ObjectList< ExtractSelectionType > ExtractSelectionListType;
   1.102 +  typedef typename ExtractSelectionListType::Pointer ExtractSelectionListPointerType;
   1.103  
   1.104 -  protected:
   1.105 -    ImageSeriesFileReader();
   1.106 -    virtual ~ImageSeriesFileReader () { }
   1.107 +protected:
   1.108 +  ImageSeriesFileReader();
   1.109 +  virtual ~ImageSeriesFileReader () { }
   1.110  
   1.111 -    /**
   1.112 -     * Tests the coherency of the Meta File (especifically band selection) with the image types
   1.113 -     */
   1.114 -    virtual void TestBandSelection( std::vector<unsigned int> & bands ) { }
   1.115 +  /** TestBandSelection
   1.116 +   * Tests the coherency of the Meta File (especifically band selection) with the image types
   1.117 +   */
   1.118 +  virtual void TestBandSelection( std::vector<unsigned int> & bands ) { }
   1.119  
   1.120 -    /** GenerateData
   1.121 -     * This method will be specialised if template definitions follow:
   1.122 -     * - TImage is a VectorImage
   1.123 -     * - TImage is an Image and TInteranalImage is a VectorImage
   1.124 -     * - TImage and TInternalImage are of Image type.
   1.125 -     */
   1.126 -    virtual void GenerateData ( unsigned int idx );
   1.127 +  /** GenerateData
   1.128 +   * This method will be specialised if template definitions follow:
   1.129 +   * - TImage is a VectorImage
   1.130 +   * - TImage is an Image and TInteranalImage is a VectorImage
   1.131 +   * - TImage and TInternalImage are of Image type.
   1.132 +   */
   1.133 +  virtual void GenerateData ( unsigned int idx );
   1.134  
   1.135 -    /**
   1.136 -     * Once MetaFile is read, allocation of lists are performed in SetFileName.
   1.137 -     * This allows specific (or global) initialisation in the GenerateData methods,
   1.138 -     * that the user may invoke throught GenerateOutput() or GenerateOutput( idx ).
   1.139 -     */
   1.140 -    virtual void AllocateListOfComponents ( void );
   1.141 +  /** AllocateListOfComponents
   1.142 +   * Once MetaFile is read, allocation of lists are performed in SetFileName.
   1.143 +   * This allows specific (or global) initialisation in the GenerateData methods,
   1.144 +   * that the user may invoke throught GenerateOutput() or GenerateOutput( idx ).
   1.145 +   */
   1.146 +  virtual void AllocateListOfComponents ( void );
   1.147  
   1.148 -    /** PrintSelf method */
   1.149 -    void PrintSelf ( std::ostream& os, itk::Indent indent ) const
   1.150 -    {
   1.151 -            return Superclass::PrintSelf( os, indent );
   1.152 -    }
   1.153 +  /** PrintSelf method */
   1.154 +  void PrintSelf ( std::ostream& os, itk::Indent indent ) const
   1.155 +  {
   1.156 +    return Superclass::PrintSelf( os, indent );
   1.157 +  }
   1.158  
   1.159 -    /**
   1.160 -     * Type of extractor to use
   1.161 -     */
   1.162 -    ExtractSelectionListPointerType m_ExtractorList;
   1.163 +  /**
   1.164 +   * Type of extractor to use
   1.165 +   */
   1.166 +  ExtractSelectionListPointerType m_ExtractorList;
   1.167  
   1.168 -  private:
   1.169 -    ImageSeriesFileReader ( const Self & );
   1.170 -    void operator= ( const Self & );
   1.171 +private:
   1.172 +  ImageSeriesFileReader ( const Self & );
   1.173 +  void operator= ( const Self & );
   1.174  }; // end of class
   1.175  
   1.176  /**
   1.177 @@ -156,92 +156,91 @@
   1.178  class ITK_EXPORT ImageSeriesFileReader< Image< TPixel, 2 >, Image< TInternalPixel, 2 > >
   1.179          : public ImageSeriesFileReaderBase< Image< TPixel, 2 >, Image< TInternalPixel, 2 > >
   1.180  {
   1.181 -        public:
   1.182 -    /** Standart typedefs */
   1.183 -    typedef ImageSeriesFileReader Self;
   1.184 -    typedef ImageSeriesFileReaderBase< Image< TPixel, 2 >, Image< TInternalPixel, 2 > > Superclass;
   1.185 -    typedef itk::SmartPointer<Self> Pointer;
   1.186 -    typedef itk::SmartPointer<const Self> ConstPointer;
   1.187 +public:
   1.188 +  /** Standart typedefs */
   1.189 +  typedef ImageSeriesFileReader Self;
   1.190 +  typedef ImageSeriesFileReaderBase< Image< TPixel, 2 >, Image< TInternalPixel, 2 > > Superclass;
   1.191 +  typedef itk::SmartPointer<Self> Pointer;
   1.192 +  typedef itk::SmartPointer<const Self> ConstPointer;
   1.193  
   1.194 -    /** Creation through object factory macro */
   1.195 -    itkNewMacro(Self);
   1.196 -    /** Runtime informations macro */
   1.197 -    itkTypeMacro(ImageSeriesFileReader,ImageSeriesFileReaderBase);
   1.198 +  /** Creation through object factory macro */
   1.199 +  itkNewMacro(Self);
   1.200 +  /** Runtime informations macro */
   1.201 +  itkTypeMacro(ImageSeriesFileReader,ImageSeriesFileReaderBase);
   1.202  
   1.203 -    typedef typename Superclass::OutputImageType        OutputImageType;
   1.204 -    typedef typename Superclass::OutputImagePointerType OutputImagePointerType;
   1.205 -    typedef typename Superclass::PixelType                                                         PixelType;
   1.206 -    typedef typename Superclass::ValueType                                                         ValueType;
   1.207 -    typedef typename Superclass::IndexType                                                         IndexType;
   1.208 -    typedef typename Superclass::SizeType                                                         SizeType;
   1.209 -    typedef typename Superclass::RegionType                                                 RegionType;
   1.210 +  typedef typename Superclass::OutputImageType        OutputImageType;
   1.211 +  typedef typename Superclass::OutputImagePointerType OutputImagePointerType;
   1.212 +  typedef typename Superclass::PixelType              PixelType;
   1.213 +  typedef typename Superclass::ValueType              ValueType;
   1.214 +  typedef typename Superclass::IndexType              IndexType;
   1.215 +  typedef typename Superclass::SizeType               SizeType;
   1.216 +  typedef typename Superclass::RegionType             RegionType;
   1.217  
   1.218 -    typedef typename Superclass::OutputImageListType                                                 OutputImageListType;
   1.219 -    typedef typename Superclass::OutputImageListPointerType                         OutputImageListPointerType;
   1.220 -    typedef typename Superclass::OutputImageListConstPointerType OutputImageListConstPointerType;
   1.221 +  typedef typename Superclass::OutputImageListType             OutputImageListType;
   1.222 +  typedef typename Superclass::OutputImageListPointerType      OutputImageListPointerType;
   1.223 +  typedef typename Superclass::OutputImageListConstPointerType OutputImageListConstPointerType;
   1.224  
   1.225 -    typedef typename Superclass::InternalImageType                                 InternalImageType;
   1.226 -    typedef typename Superclass::InternalImagePointerType InternalImagePointerType;
   1.227 -    typedef typename Superclass::InternalPixelType                          InternalPixelType;
   1.228 -    typedef typename Superclass::InternalValueType                                 InternalValueType;
   1.229 -    typedef typename Superclass::InternalIndexType                                 InternalIndexType;
   1.230 -    typedef typename Superclass::InternalSizeType                           InternalSizeType;
   1.231 -    typedef typename Superclass::InternalRegionType                         InternalRegionType;
   1.232 +  typedef typename Superclass::InternalImageType        InternalImageType;
   1.233 +  typedef typename Superclass::InternalImagePointerType InternalImagePointerType;
   1.234 +  typedef typename Superclass::InternalPixelType        InternalPixelType;
   1.235 +  typedef typename Superclass::InternalValueType        InternalValueType;
   1.236 +  typedef typename Superclass::InternalIndexType        InternalIndexType;
   1.237 +  typedef typename Superclass::InternalSizeType         InternalSizeType;
   1.238 +  typedef typename Superclass::InternalRegionType       InternalRegionType;
   1.239  
   1.240 -    typedef typename Superclass::ReaderType ReaderType;
   1.241 -    typedef typename Superclass::ReaderType ReaderPointerType;
   1.242 +  typedef typename Superclass::ReaderType ReaderType;
   1.243 +  typedef typename Superclass::ReaderType ReaderPointerType;
   1.244  
   1.245 -    typedef typename Superclass::ReaderListType                          ReaderListType;
   1.246 -    typedef typename Superclass::ReaderListPointerType ReaderListPointerType;
   1.247 +  typedef typename Superclass::ReaderListType        ReaderListType;
   1.248 +  typedef typename Superclass::ReaderListPointerType ReaderListPointerType;
   1.249  
   1.250 -    /** This is a specialised template definition of the ROI extraction procedure.
   1.251 -                 * Here TExtractSelection is a ExtractROI class since TImage and TInternalImage are of Image type.
   1.252 -                 */
   1.253 -    typedef ExtractROI< InternalPixelType, PixelType > ExtractSelectionType;
   1.254 -    typedef typename ExtractSelectionType::Pointer ExtractSelectionPointerType;
   1.255 +  /** This is a specialised template definition of the ROI extraction procedure.
   1.256 +   * Here TExtractSelection is a ExtractROI class since TImage and TInternalImage are of Image type.
   1.257 +   */
   1.258 +  typedef ExtractROI< InternalPixelType, PixelType > ExtractSelectionType;
   1.259 +  typedef typename ExtractSelectionType::Pointer ExtractSelectionPointerType;
   1.260  
   1.261 -    typedef ObjectList< ExtractSelectionType > ExtractSelectionListType;
   1.262 -    typedef typename ExtractSelectionListType::Pointer ExtractSelectionListPointerType;
   1.263 +  typedef ObjectList< ExtractSelectionType > ExtractSelectionListType;
   1.264 +  typedef typename ExtractSelectionListType::Pointer ExtractSelectionListPointerType;
   1.265  
   1.266 -        protected:
   1.267 -    ImageSeriesFileReader();
   1.268 -    virtual ~ImageSeriesFileReader () { }
   1.269 +protected:
   1.270 +  ImageSeriesFileReader();
   1.271 +  virtual ~ImageSeriesFileReader () { }
   1.272  
   1.273 -                /**
   1.274 -                 * Tests the coherency of the Meta File (especifically band selection) with the image types
   1.275 -                 */
   1.276 -                virtual void TestBandSelection( std::vector<unsigned int> & bands );
   1.277 +  /** TestBandSelection
   1.278 +   * Tests the coherency of the Meta File (especifically band selection) with the image types
   1.279 +   */
   1.280 +  virtual void TestBandSelection( std::vector<unsigned int> & bands );
   1.281  
   1.282 -                /** GenerateData
   1.283 -                 * This method will be specialised if template definitions follow:
   1.284 -                 * - TImage is a VectorImage
   1.285 -                 * - TImage is an Image and TInteranalImage is a VectorImage
   1.286 -                 * - TImage and TInternalImage are of Image type.
   1.287 -                 */
   1.288 -    virtual void GenerateData ( unsigned int idx );
   1.289 +  /** GenerateData
   1.290 +   * This method will be specialised if template definitions follow:
   1.291 +   * - TImage is a VectorImage
   1.292 +   * - TImage is an Image and TInteranalImage is a VectorImage
   1.293 +   * - TImage and TInternalImage are of Image type.
   1.294 +   */
   1.295 +  virtual void GenerateData ( unsigned int idx );
   1.296  
   1.297 -    /**
   1.298 -     * Once MetaFile is read, allocation of lists are performed in SetFileName.
   1.299 -     * This allows specific (or global) initialisation in the GenerateData methods,
   1.300 -     * that the user may invoke throught GenerateOutput() or GenerateOutput( idx ).
   1.301 -     */
   1.302 -    virtual void AllocateListOfComponents ( void );
   1.303 +  /**
   1.304 +   * Once MetaFile is read, allocation of lists are performed in SetFileName.
   1.305 +   * This allows specific (or global) initialisation in the GenerateData methods,
   1.306 +   * that the user may invoke throught GenerateOutput() or GenerateOutput( idx ).
   1.307 +   */
   1.308 +  virtual void AllocateListOfComponents ( void );
   1.309  
   1.310 -    /** PrintSelf method */
   1.311 -    void PrintSelf ( std::ostream& os, itk::Indent indent ) const
   1.312 -                {
   1.313 -                        return Superclass::PrintSelf( os, indent );
   1.314 -                }
   1.315 +  /** PrintSelf method */
   1.316 +  void PrintSelf ( std::ostream& os, itk::Indent indent ) const
   1.317 +  {
   1.318 +    return Superclass::PrintSelf( os, indent );
   1.319 +  }
   1.320  
   1.321 -                /**
   1.322 -                 * Type of extractor to use
   1.323 -                 */
   1.324 -    ExtractSelectionListPointerType m_ExtractorList;
   1.325 +  /**
   1.326 +   * Type of extractor to use
   1.327 +   */
   1.328 +  ExtractSelectionListPointerType m_ExtractorList;
   1.329  
   1.330 -  private:
   1.331 -    ImageSeriesFileReader ( const Self & );
   1.332 -    void operator= ( const Self & );
   1.333 -
   1.334 +private:
   1.335 +  ImageSeriesFileReader ( const Self & );
   1.336 +  void operator= ( const Self & );
   1.337  }; // end of class specialized for image
   1.338  
   1.339  /** ImagerSeriesFileReader
   1.340 @@ -258,91 +257,91 @@
   1.341  class ITK_EXPORT ImageSeriesFileReader< Image< TPixel, 2 >, VectorImage< TInternalPixel, 2 > >
   1.342          : public ImageSeriesFileReaderBase< Image< TPixel, 2 >, VectorImage< TInternalPixel, 2 > >
   1.343  {
   1.344 -        public:
   1.345 -    /** Standart typedefs */
   1.346 -    typedef ImageSeriesFileReader Self;
   1.347 -    typedef ImageSeriesFileReaderBase< Image< TPixel, 2 >, VectorImage< TInternalPixel, 2 > > Superclass;
   1.348 -    typedef itk::SmartPointer<Self> Pointer;
   1.349 -    typedef itk::SmartPointer<const Self> ConstPointer;
   1.350 +public:
   1.351 +  /** Standart typedefs */
   1.352 +  typedef ImageSeriesFileReader Self;
   1.353 +  typedef ImageSeriesFileReaderBase< Image< TPixel, 2 >, VectorImage< TInternalPixel, 2 > > Superclass;
   1.354 +  typedef itk::SmartPointer<Self> Pointer;
   1.355 +  typedef itk::SmartPointer<const Self> ConstPointer;
   1.356  
   1.357 -    /** Creation through object factory macro */
   1.358 -    itkNewMacro(Self);
   1.359 -    /** Runtime informations macro */
   1.360 -    itkTypeMacro(ImageSeriesFileReader,ImageSeriesFileReaderBase);
   1.361 +  /** Creation through object factory macro */
   1.362 +  itkNewMacro(Self);
   1.363 +  /** Runtime informations macro */
   1.364 +  itkTypeMacro(ImageSeriesFileReader,ImageSeriesFileReaderBase);
   1.365  
   1.366 -    typedef typename Superclass::OutputImageType        OutputImageType;
   1.367 -    typedef typename Superclass::OutputImagePointerType OutputImagePointerType;
   1.368 -    typedef typename Superclass::PixelType                                                         PixelType;
   1.369 -    typedef typename Superclass::ValueType                                                         ValueType;
   1.370 -    typedef typename Superclass::IndexType                                                         IndexType;
   1.371 -    typedef typename Superclass::SizeType                                                         SizeType;
   1.372 -    typedef typename Superclass::RegionType                                                 RegionType;
   1.373 +  typedef typename Superclass::OutputImageType        OutputImageType;
   1.374 +  typedef typename Superclass::OutputImagePointerType OutputImagePointerType;
   1.375 +  typedef typename Superclass::PixelType              PixelType;
   1.376 +  typedef typename Superclass::ValueType              ValueType;
   1.377 +  typedef typename Superclass::IndexType              IndexType;
   1.378 +  typedef typename Superclass::SizeType               SizeType;
   1.379 +  typedef typename Superclass::RegionType             RegionType;
   1.380  
   1.381 -    typedef typename Superclass::OutputImageListType                                                 OutputImageListType;
   1.382 -    typedef typename Superclass::OutputImageListPointerType                         OutputImageListPointerType;
   1.383 -    typedef typename Superclass::OutputImageListConstPointerType OutputImageListConstPointerType;
   1.384 +  typedef typename Superclass::OutputImageListType             OutputImageListType;
   1.385 +  typedef typename Superclass::OutputImageListPointerType      OutputImageListPointerType;
   1.386 +  typedef typename Superclass::OutputImageListConstPointerType OutputImageListConstPointerType;
   1.387  
   1.388 -    typedef typename Superclass::InternalImageType                                 InternalImageType;
   1.389 -    typedef typename Superclass::InternalImagePointerType InternalImagePointerType;
   1.390 -    typedef typename Superclass::InternalPixelType                          InternalPixelType;
   1.391 -    typedef typename Superclass::InternalValueType                                 InternalValueType;
   1.392 -    typedef typename Superclass::InternalIndexType                                 InternalIndexType;
   1.393 -    typedef typename Superclass::InternalSizeType                           InternalSizeType;
   1.394 -    typedef typename Superclass::InternalRegionType                         InternalRegionType;
   1.395 +  typedef typename Superclass::InternalImageType        InternalImageType;
   1.396 +  typedef typename Superclass::InternalImagePointerType InternalImagePointerType;
   1.397 +  typedef typename Superclass::InternalPixelType        InternalPixelType;
   1.398 +  typedef typename Superclass::InternalValueType        InternalValueType;
   1.399 +  typedef typename Superclass::InternalIndexType        InternalIndexType;
   1.400 +  typedef typename Superclass::InternalSizeType         InternalSizeType;
   1.401 +  typedef typename Superclass::InternalRegionType       InternalRegionType;
   1.402  
   1.403 -    typedef typename Superclass::ReaderType ReaderType;
   1.404 -    typedef typename Superclass::ReaderType ReaderPointerType;
   1.405 +  typedef typename Superclass::ReaderType ReaderType;
   1.406 +  typedef typename Superclass::ReaderType ReaderPointerType;
   1.407  
   1.408 -    typedef typename Superclass::ReaderListType                          ReaderListType;
   1.409 -    typedef typename Superclass::ReaderListPointerType ReaderListPointerType;
   1.410 +  typedef typename Superclass::ReaderListType        ReaderListType;
   1.411 +  typedef typename Superclass::ReaderListPointerType ReaderListPointerType;
   1.412  
   1.413 -    /** This is a specific template definition of the ROI extraction procedure.
   1.414 -                 * MultiToMonoChannelExtractROI since TImage is an Image and TInteranalImage is a VectorImage
   1.415 -                 */
   1.416 -    typedef MultiToMonoChannelExtractROI< InternalPixelType, PixelType > ExtractSelectionType;
   1.417 -    typedef typename ExtractSelectionType::Pointer ExtractSelectionPointerType;
   1.418 +  /** This is a specific template definition of the ROI extraction procedure.
   1.419 +   * MultiToMonoChannelExtractROI since TImage is an Image and TInteranalImage is a VectorImage
   1.420 +   */
   1.421 +  typedef MultiToMonoChannelExtractROI< InternalPixelType, PixelType > ExtractSelectionType;
   1.422 +  typedef typename ExtractSelectionType::Pointer ExtractSelectionPointerType;
   1.423  
   1.424 -    typedef ObjectList< ExtractSelectionType > ExtractSelectionListType;
   1.425 -    typedef typename ExtractSelectionListType::Pointer ExtractSelectionListPointerType;
   1.426 +  typedef ObjectList< ExtractSelectionType > ExtractSelectionListType;
   1.427 +  typedef typename ExtractSelectionListType::Pointer ExtractSelectionListPointerType;
   1.428  
   1.429 -        protected:
   1.430 -    ImageSeriesFileReader();
   1.431 -    virtual ~ImageSeriesFileReader () { }
   1.432 +protected:
   1.433 +  ImageSeriesFileReader();
   1.434 +  virtual ~ImageSeriesFileReader () { }
   1.435  
   1.436 -                /**
   1.437 -                 * Tests the coherency of the Meta File (especifically band selection) with the image types
   1.438 -                 */
   1.439 -                virtual void TestBandSelection( std::vector<unsigned int> & bands );
   1.440 +  /**
   1.441 +   * Tests the coherency of the Meta File (especifically band selection) with the image types
   1.442 +   */
   1.443 +  virtual void TestBandSelection( std::vector<unsigned int> & bands );
   1.444  
   1.445 -                /** GenerateData
   1.446 -                 * This method will be specialised if template definitions follow:
   1.447 -                 * - TImage is a VectorImage
   1.448 -                 * - TImage is an Image and TInteranalImage is a VectorImage
   1.449 -                 * - TImage and TInternalImage are of Image type.
   1.450 -                 */
   1.451 -    virtual void GenerateData ( unsigned int idx );
   1.452 +  /** GenerateData
   1.453 +   * This method will be specialised if template definitions follow:
   1.454 +   * - TImage is a VectorImage
   1.455 +   * - TImage is an Image and TInteranalImage is a VectorImage
   1.456 +   * - TImage and TInternalImage are of Image type.
   1.457 +   */
   1.458 +  virtual void GenerateData ( unsigned int idx );
   1.459  
   1.460 -    /**
   1.461 -     * Once MetaFile is read, allocation of lists are performed in SetFileName.
   1.462 -     * This allows specific (or global) initialisation in the GenerateData methods,
   1.463 -     * that the user may invoke throught GenerateOutput() or GenerateOutput( idx ).
   1.464 -     */
   1.465 -    virtual void AllocateListOfComponents ( void );
   1.466 +  /**
   1.467 +   * Once MetaFile is read, allocation of lists are performed in SetFileName.
   1.468 +   * This allows specific (or global) initialisation in the GenerateData methods,
   1.469 +   * that the user may invoke throught GenerateOutput() or GenerateOutput( idx ).
   1.470 +   */
   1.471 +  virtual void AllocateListOfComponents ( void );
   1.472  
   1.473 -    /** PrintSelf method */
   1.474 -    void PrintSelf ( std::ostream& os, itk::Indent indent ) const
   1.475 -                {
   1.476 -                        return Superclass::PrintSelf( os, indent );
   1.477 -                }
   1.478 +  /** PrintSelf method */
   1.479 +  void PrintSelf ( std::ostream& os, itk::Indent indent ) const
   1.480 +  {
   1.481 +    return Superclass::PrintSelf( os, indent );
   1.482 +  }
   1.483  
   1.484 -                /**
   1.485 -                 * Type of extractor to use
   1.486 -                 */
   1.487 -    ExtractSelectionListPointerType m_ExtractorList;
   1.488 +  /**
   1.489 +   * Type of extractor to use
   1.490 +   */
   1.491 +  ExtractSelectionListPointerType m_ExtractorList;
   1.492  
   1.493 -  private:
   1.494 -    ImageSeriesFileReader ( const Self & );
   1.495 -    void operator= ( const Self & );
   1.496 +private:
   1.497 +  ImageSeriesFileReader ( const Self & );
   1.498 +  void operator= ( const Self & );
   1.499  
   1.500  
   1.501  }; // end of class specialized for Image and VectorImage
   1.502 @@ -361,92 +360,93 @@
   1.503  class ITK_EXPORT ImageSeriesFileReader< VectorImage< TPixel, 2 >, VectorImage< TInternalPixel, 2 > >
   1.504          : public ImageSeriesFileReaderBase< VectorImage< TPixel, 2 >, VectorImage< TInternalPixel, 2 > >
   1.505  {
   1.506 -        public:
   1.507 -    /** Standart typedefs */
   1.508 -    typedef ImageSeriesFileReader Self;
   1.509 -    typedef ImageSeriesFileReaderBase< VectorImage< TPixel, 2 >, VectorImage< TInternalPixel, 2 > > Superclass;
   1.510 -    typedef itk::SmartPointer<Self> Pointer;
   1.511 -    typedef itk::SmartPointer<const Self> ConstPointer;
   1.512 +public:
   1.513 +  /** Standart typedefs */
   1.514 +  typedef ImageSeriesFileReader Self;
   1.515 +  typedef ImageSeriesFileReaderBase< VectorImage< TPixel, 2 >, VectorImage< TInternalPixel, 2 > > Superclass;
   1.516 +  typedef itk::SmartPointer<Self> Pointer;
   1.517 +  typedef itk::SmartPointer<const Self> ConstPointer;
   1.518  
   1.519 -    /** Creation through object factory macro */
   1.520 -    itkNewMacro(Self);
   1.521 -    /** Runtime informations macro */
   1.522 -    itkTypeMacro(ImageSeriesFileReader,ImageSeriesFileReaderBase);
   1.523 +  /** Creation through object factory macro */
   1.524 +  itkNewMacro(Self);
   1.525 +  /** Runtime informations macro */
   1.526 +  itkTypeMacro(ImageSeriesFileReader,ImageSeriesFileReaderBase);
   1.527  
   1.528 -    typedef typename Superclass::OutputImageType        OutputImageType;
   1.529 -    typedef typename Superclass::OutputImagePointerType OutputImagePointerType;
   1.530 -    typedef typename Superclass::PixelType                                                         PixelType;
   1.531 -    typedef typename Superclass::ValueType                                                         ValueType;
   1.532 -    typedef typename Superclass::IndexType                                                         IndexType;
   1.533 -    typedef typename Superclass::SizeType                                                         SizeType;
   1.534 -    typedef typename Superclass::RegionType                                                 RegionType;
   1.535 +  typedef typename Superclass::OutputImageType        OutputImageType;
   1.536 +  typedef typename Superclass::OutputImagePointerType OutputImagePointerType;
   1.537 +  typedef typename Superclass::PixelType              PixelType;
   1.538 +  typedef typename Superclass::ValueType              ValueType;
   1.539 +  typedef typename Superclass::IndexType              IndexType;
   1.540 +  typedef typename Superclass::SizeType               SizeType;
   1.541 +  typedef typename Superclass::RegionType             RegionType;
   1.542  
   1.543 -    typedef typename Superclass::OutputImageListType                                                 OutputImageListType;
   1.544 -    typedef typename Superclass::OutputImageListPointerType                         OutputImageListPointerType;
   1.545 -    typedef typename Superclass::OutputImageListConstPointerType OutputImageListConstPointerType;
   1.546 +  typedef typename Superclass::OutputImageListType             OutputImageListType;
   1.547 +  typedef typename Superclass::OutputImageListPointerType      OutputImageListPointerType;
   1.548 +  typedef typename Superclass::OutputImageListConstPointerType OutputImageListConstPointerType;
   1.549  
   1.550 -    typedef typename Superclass::InternalImageType                                 InternalImageType;
   1.551 -    typedef typename Superclass::InternalImagePointerType InternalImagePointerType;
   1.552 -    typedef typename Superclass::InternalPixelType                          InternalPixelType;
   1.553 -    typedef typename Superclass::InternalValueType                                 InternalValueType;
   1.554 -    typedef typename Superclass::InternalIndexType                                 InternalIndexType;
   1.555 -    typedef typename Superclass::InternalSizeType                           InternalSizeType;
   1.556 -    typedef typename Superclass::InternalRegionType                         InternalRegionType;
   1.557 +  typedef typename Superclass::InternalImageType        InternalImageType;
   1.558 +  typedef typename Superclass::InternalImagePointerType InternalImagePointerType;
   1.559 +  typedef typename Superclass::InternalPixelType        InternalPixelType;
   1.560 +  typedef typename Superclass::InternalValueType        InternalValueType;
   1.561 +  typedef typename Superclass::InternalIndexType        InternalIndexType;
   1.562 +  typedef typename Superclass::InternalSizeType         InternalSizeType;
   1.563 +  typedef typename Superclass::InternalRegionType       InternalRegionType;
   1.564  
   1.565 -    typedef typename Superclass::ReaderType ReaderType;
   1.566 -    typedef typename Superclass::ReaderType ReaderPointerType;
   1.567 +  typedef typename Superclass::ReaderType ReaderType;
   1.568 +  typedef typename Superclass::ReaderType ReaderPointerType;
   1.569  
   1.570 -    typedef typename Superclass::ReaderListType                          ReaderListType;
   1.571 -    typedef typename Superclass::ReaderListPointerType ReaderListPointerType;
   1.572 +  typedef typename Superclass::ReaderListType        ReaderListType;
   1.573 +  typedef typename Superclass::ReaderListPointerType ReaderListPointerType;
   1.574  
   1.575 -    /** This is a specific template definition of the ROI extraction procedure.
   1.576 -                 * Here, it will be specialised with:
   1.577 -                 * MultiChannelExtractROI if TImage is a VectorImage
   1.578 -                 */
   1.579 -    typedef MultiChannelExtractROI< InternalPixelType, PixelType > ExtractSelectionType;
   1.580 -    typedef typename ExtractSelectionType::Pointer ExtractSelectionPointerType;
   1.581 +  /** This is a specific template definition of the ROI extraction procedure.
   1.582 +   * Here, it will be specialised with:
   1.583 +   * MultiChannelExtractROI if TImage is a VectorImage
   1.584 +   */
   1.585 +  typedef MultiChannelExtractROI< InternalPixelType, PixelType > ExtractSelectionType;
   1.586 +  typedef typename ExtractSelectionType::Pointer ExtractSelectionPointerType;
   1.587  
   1.588 -    typedef ObjectList< ExtractSelectionType > ExtractSelectionListType;
   1.589 -    typedef typename ExtractSelectionListType::Pointer ExtractSelectionListPointerType;
   1.590 +  typedef ObjectList< ExtractSelectionType > ExtractSelectionListType;
   1.591 +  typedef typename ExtractSelectionListType::Pointer ExtractSelectionListPointerType;
   1.592  
   1.593 -        protected:
   1.594 -    ImageSeriesFileReader();
   1.595 -    virtual ~ImageSeriesFileReader () { }
   1.596  
   1.597 -                /**
   1.598 -                 * Tests the coherency of the Meta File (especifically band selection) with the image types
   1.599 -                 */
   1.600 -                virtual void TestBandSelection( std::vector<unsigned int> & bands ){ }
   1.601 +protected:
   1.602 +  ImageSeriesFileReader();
   1.603 +  virtual ~ImageSeriesFileReader () { }
   1.604  
   1.605 -                /** GenerateData
   1.606 -                 * This method will be specialised if template definitions follow:
   1.607 -                 * - TImage is a VectorImage
   1.608 -                 * - TImage is an Image and TInteranalImage is a VectorImage
   1.609 -                 * - TImage and TInternalImage are of Image type.
   1.610 -                 */
   1.611 -    virtual void GenerateData ( unsigned int idx );
   1.612 +  /**
   1.613 +   * Tests the coherency of the Meta File (especifically band selection) with the image types
   1.614 +   */
   1.615 +  virtual void TestBandSelection( std::vector<unsigned int> & bands ){ }
   1.616  
   1.617 -    /**
   1.618 -     * Once MetaFile is read, allocation of lists are performed in SetFileName.
   1.619 -     * This allows specific (or global) initialisation in the GenerateData methods,
   1.620 -     * that the user may invoke throught GenerateOutput() or GenerateOutput( idx ).
   1.621 -     */
   1.622 -    virtual void AllocateListOfComponents ( void );
   1.623 +  /** GenerateData
   1.624 +   * This method will be specialised if template definitions follow:
   1.625 +   * - TImage is a VectorImage
   1.626 +   * - TImage is an Image and TInteranalImage is a VectorImage
   1.627 +   * - TImage and TInternalImage are of Image type.
   1.628 +   */
   1.629 +  virtual void GenerateData ( unsigned int idx );
   1.630  
   1.631 -    /** PrintSelf method */
   1.632 -    void PrintSelf ( std::ostream& os, itk::Indent indent ) const
   1.633 -                {
   1.634 -                        return Superclass::PrintSelf( os, indent );
   1.635 -                }
   1.636 +  /**
   1.637 +   * Once MetaFile is read, allocation of lists are performed in SetFileName.
   1.638 +   * This allows specific (or global) initialisation in the GenerateData methods,
   1.639 +   * that the user may invoke throught GenerateOutput() or GenerateOutput( idx ).
   1.640 +   */
   1.641 +  virtual void AllocateListOfComponents ( void );
   1.642  
   1.643 -                /**
   1.644 -                 * Type of extractor to use
   1.645 -                 */
   1.646 -    ExtractSelectionListPointerType m_ExtractorList;
   1.647 +  /** PrintSelf method */
   1.648 +  void PrintSelf ( std::ostream& os, itk::Indent indent ) const
   1.649 +  {
   1.650 +    return Superclass::PrintSelf( os, indent );
   1.651 +  }
   1.652  
   1.653 -  private:
   1.654 -    ImageSeriesFileReader ( const Self & );
   1.655 -    void operator= ( const Self & );
   1.656 +  /**
   1.657 +   * Type of extractor to use
   1.658 +   */
   1.659 +  ExtractSelectionListPointerType m_ExtractorList;
   1.660 +
   1.661 +private:
   1.662 +  ImageSeriesFileReader ( const Self & );
   1.663 +  void operator= ( const Self & );
   1.664  }; // end of class specialized for VectorImage
   1.665  
   1.666  } // end of namespace otb