Correction FA 47 : namespace "morphologicalPyramid" remplacé par "MorphologicalPyramid"

Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.h

@@ -22,7 +22,7 @@
 
 namespace otb
 {
-  namespace morphologicalPyramid
+  namespace MorphologicalPyramid
     {
       /**
        * \class MRToMSConverter
@@ -157,7 +157,7 @@ namespace otb
 	    MRToMSConverter(const Self&); // purposely not implemented
 	  void operator=(const Self&); // purposely not implemented
 	};
-    } // End namespace morphologicalPyramid
+    } // End namespace MorphologicalPyramid
 }// End namespace otb
 
 #ifndef ITK_MANUAL_INSTANTIATION

Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.txx

@@ -24,7 +24,7 @@ PURPOSE.  See the above copyright notices for more information.
 
 namespace otb
 {
-  namespace morphologicalPyramid
+  namespace MorphologicalPyramid
   {
     /**
      * Constructor
@@ -351,6 +351,6 @@ namespace otb
     {
       Superclass::PrintSelf(os,indent);
     }
-  } // End namespace morphologicalPyramid
+  } // End namespace MorphologicalPyramid
 } // End namespace otb
 #endif

Code/MultiScale/otbMorphologicalPyramidResampler.h

@@ -22,7 +22,7 @@ PURPOSE.  See the above copyright notices for more information.
 
 namespace otb
 {
-  namespace morphologicalPyramid
+  namespace MorphologicalPyramid
     {
       /**
        * \class Resampler
@@ -89,7 +89,7 @@ namespace otb
 	  /// Output image size
 	  SizeType m_Size;
 	};
-    } // End namespace morphologicalPyramid
+    } // End namespace MorphologicalPyramid
 }// End namespace otb
 
 #ifndef ITK_MANUAL_INSTANTIATION

Code/MultiScale/otbMorphologicalPyramidResampler.txx

@@ -28,7 +28,7 @@
 
 namespace otb
 {
-namespace morphologicalPyramid
+namespace MorphologicalPyramid
 {
 /**
  * Constructor
@@ -104,9 +104,9 @@ Resampler<TInputImage,TOutputImage>
      {
      outputStartIndex[i] =  inputStartIndex[i] ;
      }
-  // Affectation du spacing  l'image de sortie
+  // Affectation du spacing � l'image de sortie
   outputPtr->SetSpacing( inputSpacing );
-  // Gnration de la rgion de l'image de sortie
+  // G�n�ration de la r�gion de l'image de sortie
   typename OutputImageType::RegionType outputLargestPossibleRegion;
   outputLargestPossibleRegion.SetSize(this->GetSize());
   outputLargestPossibleRegion.SetIndex(outputStartIndex);
@@ -174,6 +174,6 @@ Resampler<TInputImage, TOuputImage>
   Superclass::PrintSelf(os,indent);
   os << indent << "Size: " << m_Size << std::endl;
 }
-} // End namespace morphologicalPyramid
+} // End namespace MorphologicalPyramid
 } // End namespace otb
 #endif

Code/MultiScale/otbMorphologicalPyramidSegmenter.h

@@ -22,7 +22,7 @@ PURPOSE.  See the above copyright notices for more information.
 
 namespace otb
 {
-  namespace morphologicalPyramid
+  namespace MorphologicalPyramid
     {
       /**
        * \class Segmenter
@@ -143,7 +143,7 @@ namespace otb
 	  /** Number of segmented objects */
 	  OutputPixelType m_NumberOfObjects;
 	};
-    } // End namespace morphologicalPyramid
+    } // End namespace MorphologicalPyramid
 }// End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION

Code/MultiScale/otbMorphologicalPyramidSegmenter.txx

@@ -34,7 +34,7 @@
 
 namespace otb
 {
-namespace morphologicalPyramid
+namespace MorphologicalPyramid
 {
 /**
  * Constructor
@@ -310,6 +310,6 @@ Segmenter<TInputImage, TOuputImage>
   Superclass::PrintSelf(os,indent);
 
 }
-} // End namespace morphologicalPyramid
+} // End namespace MorphologicalPyramid
 } // End namespace otb
 #endif

Examples/MultiScale/MorphologicalPyramidSegmenterExample.cxx

@@ -96,7 +96,7 @@ int main(int argc, char * argv[])
 
 // Software Guide : BeginCodeSnippet
       
-      typedef otb::morphologicalPyramid::Segmenter<InputImageType,
+      typedef otb::MorphologicalPyramid::Segmenter<InputImageType,
                                                       LabelImageType>
 	                                                SegmenterType;
 

Testing/Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.cxx

@@ -51,7 +51,7 @@ int otbMorphologicalPyramidMRToMSConverter(int argc, char * argv[])
 	OpeningClosingFilterType;
       typedef otb::MorphologicalPyramidAnalyseFilter<InputImageType,InputImageType,OpeningClosingFilterType>
 	PyramidAnalyseFilterType;
-      typedef otb::morphologicalPyramid::MRToMSConverter<InputImageType,OutputImageType> MRToMSConverterType;
+      typedef otb::MorphologicalPyramid::MRToMSConverter<InputImageType,OutputImageType> MRToMSConverterType;
 
 
       // Reading input image

Testing/Code/MultiScale/otbMorphologicalPyramidMRToMSConverterNew.cxx

@@ -30,7 +30,7 @@ int otbMorphologicalPyramidMRToMSConverterNew(int argc, char * argv[])
 
       typedef otb::Image<InputPixelType,Dimension> InputImageType;
       typedef otb::Image<OutputPixelType,Dimension> OutputImageType;
-      typedef otb::morphologicalPyramid::MRToMSConverter<InputImageType,OutputImageType> MRToMSConverterType;
+      typedef otb::MorphologicalPyramid::MRToMSConverter<InputImageType,OutputImageType> MRToMSConverterType;
 
 
       // Instantiation

Testing/Code/MultiScale/otbMorphologicalPyramidResampler.cxx

@@ -41,7 +41,7 @@ int otbMorphologicalPyramidResampler(int argc, char * argv[])
       typedef otb::ImageFileReader<InputImageType> ReaderType;
       typedef otb::ImageFileWriter<OutputImageType> WriterType;
 
-      typedef otb::morphologicalPyramid::Resampler<InputImageType,OutputImageType>
+      typedef otb::MorphologicalPyramid::Resampler<InputImageType,OutputImageType>
 	ResamplerType;
 
       // Input image reading

Testing/Code/MultiScale/otbMorphologicalPyramidResamplerNew.cxx

@@ -30,7 +30,7 @@ int otbMorphologicalPyramidResamplerNew(int argc, char * argv[])
       typedef otb::Image<InputPixelType,Dimension> InputImageType;
       typedef otb::Image<OutputPixelType,Dimension> OutputImageType;
 
-      typedef otb::morphologicalPyramid::Resampler<InputImageType,OutputImageType>
+      typedef otb::MorphologicalPyramid::Resampler<InputImageType,OutputImageType>
 	ResamplerType;
 
       // Instantiation

Testing/Code/MultiScale/otbMorphologicalPyramidSegmenter.cxx

@@ -43,7 +43,7 @@ int otbMorphologicalPyramidSegmenter(int argc, char * argv[])
       typedef otb::ImageFileReader<InputImageType> ReaderType;
       typedef otb::ImageFileWriter<OutputImageType> WriterType;
 
-      typedef otb::morphologicalPyramid::Segmenter<InputImageType,OutputImageType>
+      typedef otb::MorphologicalPyramid::Segmenter<InputImageType,OutputImageType>
 	SegmenterType;
 
       // Input images reading

Testing/Code/MultiScale/otbMorphologicalPyramidSegmenterNew.cxx

@@ -30,7 +30,7 @@ int otbMorphologicalPyramidSegmenterNew(int argc, char * argv[])
       typedef otb::Image<InputPixelType,Dimension> InputImageType;
       typedef otb::Image<OutputPixelType,Dimension> OutputImageType;
    
-      typedef otb::morphologicalPyramid::Segmenter<InputImageType,OutputImageType>
+      typedef otb::MorphologicalPyramid::Segmenter<InputImageType,OutputImageType>
 	SegmenterType;
 
       // Instantiation