MRG: Merging heads

Code/BasicFilters/otbVectorImageToImageListFilter.txx

@@ -88,8 +88,6 @@ VectorImageToImageListFilter<TVectorImageType,TImageList>
 
   typedef itk::ImageRegionConstIteratorWithIndex<InputVectorImageType> InputIteratorType;
   typedef itk::ImageRegionIteratorWithIndex<OutputImageType> OutputIteratorType;
-
-  InputIteratorType inputIt(inputPtr,inputPtr->GetRequestedRegion());
   
   std::vector<OutputIteratorType> outputIteratorList;
   
@@ -98,10 +96,13 @@ VectorImageToImageListFilter<TVectorImageType,TImageList>
     {
       outputListIt.Get()->SetBufferedRegion(outputListIt.Get()->GetRequestedRegion());
       outputListIt.Get()->Allocate();
-      outputIteratorList.push_back(OutputIteratorType(outputListIt.Get(),outputListIt.Get()->GetRequestedRegion()));
-      outputIteratorList.back().GoToBegin();
+      OutputIteratorType tmpIt = OutputIteratorType(outputListIt.Get(),outputListIt.Get()->GetRequestedRegion());
+      tmpIt.GoToBegin();
+      outputIteratorList.push_back(tmpIt);
     }
 
+  InputIteratorType inputIt(inputPtr,outputPtr->GetNthElement(0)->GetRequestedRegion());
+
   inputIt.GoToBegin();
   while(!inputIt.IsAtEnd())
     {

Code/Common/otbCommandLineArgumentParser.h

@@ -199,25 +199,28 @@ private:
  * \class CommandLineArgumentParser
  * \brief Utility to Parse command line argument.
  * Usage:
- *   - Initialize the parser:
+ *  - Initialize the parser:
  * \code
- *    // Initialize the parser
  *    CommandLineArgumentParser parser;
+ *    parser.AddInputImage();
  *    parser.AddOption("-f",1);
  *    parser.AddSynonim("-f","--filename");
  *    parser.AddOption("-v",0);
  *    parser.AddSynonim("-v","--verbose");
+ *    parser.AddOption("--DetailledName","Help explanation","-d", 1, false);
  * \endcode
  *  - Use the parser:
  * \code
  *    CommandLineArgumentParseResult result;
  *    if(parser.TryParseCommandLine(argc,argv,result))
- *       if(result.IsOptionPresent("-f"))
- *         {
- *           cout << "Filename " << result.GetOptionParameter("-f") << endl;    
- *           ...
- *         }
- * \endcode      
+ *    {
+ *      if(result.IsOptionPresent("-f"))
+ *      {
+ *        cout << "Filename " << result.GetOptionParameter("-f") << endl;
+ *        ...
+ *      }
+ *    }
+ * \endcode
  */
 class ITK_EXPORT CommandLineArgumentParser : public itk::ProcessObject
 {

Code/Common/otbFilterWatcherBase.cxx

@@ -174,15 +174,15 @@ FilterWatcherBase
   // Remove any observers we have on the old process object
   if (m_Process)
     {
-      if (m_StartTag)
+      if (m_StartFilterCommand)
 	{
 	  m_Process->RemoveObserver(m_StartTag);
 	}
-      if (m_EndTag)
+      if (m_EndFilterCommand)
 	{
 	  m_Process->RemoveObserver(m_EndTag);
 	}
-      if (m_ProgressTag)
+      if (m_ProgressFilterCommand)
 	{
 	  m_Process->RemoveObserver(m_ProgressTag);
 	}

Code/Common/otbUnaryFunctorNeighborhoodImageFilter.txx

@@ -98,8 +98,6 @@ void
 UnaryFunctorNeighborhoodImageFilter<TInputImage, TOutputImage, TFunction>
 ::ThreadedGenerateData( const OutputImageRegionType &outputRegionForThread, int threadId)
 { 
-  std::cout<<threadId<<" "<<outputRegionForThread<<std::endl;
-  //unsigned int i;
   itk::ZeroFluxNeumannBoundaryCondition<TInputImage> nbc;
 
 // We use dynamic_cast since inputs are stored as DataObjects.  The

Code/IO/otbImageIOFactory.cxx

@@ -63,10 +63,6 @@ namespace otb
           itk::MutexLockHolder<itk::SimpleMutexLock> mutexHolder( mutex );
           if( firstTime )
           {
-
-	    // MegaWave format for OTB
-	    itk::ObjectFactoryBase::RegisterFactory( MWImageIOFactory::New() );
-
 	    // RAD Format for OTB
             itk::ObjectFactoryBase::RegisterFactory( RADImageIOFactory::New() );            
                       
@@ -83,7 +79,9 @@ namespace otb
 	    
 	    // GDAL : New format for OTB
             itk::ObjectFactoryBase::RegisterFactory( GDALImageIOFactory::New() );            
-           
+	    // MegaWave format for OTB
+	    itk::ObjectFactoryBase::RegisterFactory( MWImageIOFactory::New() );
+	    
 	    // ONERA format for OTB
             itk::ObjectFactoryBase::RegisterFactory( ONERAImageIOFactory::New() );