Ajout d'un test MonoThread pour l'ortho rectif Spot5.

Testing/Code/Projections/CMakeLists.txt

@@ -296,7 +296,21 @@ ADD_TEST(prTvOrthoRectificationSPOT5 ${PROJECTIONS_TESTS2}
         N
         )        
         
-        
+ ADD_TEST(prTvOrthoRectificationMonoThreadSPOT5 ${PROJECTIONS_TESTS2} 
+  --compare-image ${EPSILON}  ${BASELINE}/prTvOrthoRectificationSPOT5_UTM.tif
+                          ${TEMP}/prTvOrthoRectificationMonoThreadSPOT5_UTM.tif
+        otbOrthoRectificationMonoThreadFilter
+        ${IMAGEDATA}/SPOT5_SCENE01/IMAGERY.TIF
+        ${TEMP}/prTvOrthoRectificationMonoThreadSPOT5_UTM.tif
+        536187
+        3950748
+        500
+        500 
+        5
+        -5
+        39
+        N
+        )       
 #========================= TESTS SINGAPOUR ===============================
 
 #SET(EMMANUELDATA ${OTB_DATA_ROOT}/Emmanuel/Singapour/000000173549_01_P001_MUL)
@@ -347,6 +361,7 @@ SET(Projections_SRCS2
 otbOrthoRectificationFilterNew.cxx
 otbOrthoRectificationFilter.cxx
 otbOrthoRectificationFilterWithDEM.cxx
+otbOrthoRectificationMonoThreadFilter.cxx
 #otbSensorImageToCarto.cxx
 #otbSensorImageDEMToCarto.cxx
 )

Testing/Code/Projections/otbOrthoRectificationMonoThreadFilter.cxx

+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+#if defined(_MSC_VER)
+#pragma warning ( disable : 4786 )
+#endif
+
+
+// iostream is used for general output
+#include <iostream>
+#include <stdlib.h>
+
+#include "otbMacro.h"
+#include "otbImage.h"
+#include "otbImageFileReader.h"
+#include "otbStreamingImageFileWriter.h"
+#include "otbInverseSensorModel.h"
+#include "otbStreamingResampleImageFilter.h"
+
+#include "otbOrthoRectificationFilter.h"
+#include "otbMapProjections.h"
+
+#include "init/ossimInit.h"
+
+
+
+int otbOrthoRectificationMonoThreadFilter( int argc, char* argv[] )
+{
+  ossimInit::instance()->initialize(argc, argv);
+  try 
+  { 
+    if(argc!=11)
+    {
+      std::cout << argv[0] <<" <input filename> <output filename> <origin easting> <origin northing> <x size> <y size> <x spacing> <y spacing> <UTM zone <UTM hemisphere>" 
+          << std::endl;
+
+      return EXIT_FAILURE;
+    }
+   
+    typedef otb::Image<double, 2>     ImageType;
+    typedef otb::ImageFileReader<ImageType>  ReaderType;
+    typedef otb::StreamingImageFileWriter<ImageType>  WriterType;
+    typedef otb::UtmInverseProjection UtmMapProjectionType ;
+    typedef otb::OrthoRectificationFilter<ImageType, ImageType, UtmMapProjectionType> OrthoRectifFilterType ;
+              
+        //Allocate pointer
+    ReaderType::Pointer             reader = ReaderType::New();
+    WriterType::Pointer             writer = WriterType::New();
+
+    OrthoRectifFilterType::Pointer  orthoRectifFilter = OrthoRectifFilterType::New();
+    UtmMapProjectionType::Pointer   utmMapProjection = UtmMapProjectionType::New();
+                                
+        // Set parameters ...
+    reader->SetFileName(argv[1]);
+    writer->SetFileName(argv[2]);
+
+    reader->GenerateOutputInformation();
+    std::cout<<reader->GetOutput()<<std::endl;
+  
+    orthoRectifFilter->SetInput(reader->GetOutput());
+        
+    ImageType::IndexType start;
+    start[0]=0;
+    start[1]=0;
+    orthoRectifFilter->SetOutputStartIndex(start);
+        
+    ImageType::SizeType size;
+    size[0]=atoi(argv[5]);      // X size
+    size[1]=atoi(argv[6]);            //Y size
+    orthoRectifFilter->SetSize(size);
+        
+    ImageType::SpacingType spacing;
+    spacing[0]=atof(argv[7]);
+    spacing[1]=atof(argv[8]);
+    orthoRectifFilter->SetOutputSpacing(spacing);
+        
+    ImageType::PointType origin;
+    origin[0]=strtod(argv[3], NULL);         //Origin easting 
+    origin[1]=strtod(argv[4], NULL);         //Origin northing
+    orthoRectifFilter->SetOutputOrigin(origin);
+        
+    utmMapProjection->SetZone(atoi(argv[9]));
+    utmMapProjection->SetHemisphere(argv[10][0]);
+    orthoRectifFilter->SetMapProjection(utmMapProjection);
+
+    writer->SetInput(orthoRectifFilter->GetOutput());
+                          
+    writer->SetTilingStreamDivisions();
+    writer->SetNumberOfThreads(1);
+    writer->Update();
+  } 
+  catch( itk::ExceptionObject & err ) 
+  { 
+    std::cout << "Exception itk::ExceptionObject levee !" << std::endl; 
+    std::cout << err << std::endl; 
+    return EXIT_FAILURE;
+  } 
+  catch( std::bad_alloc & err ) 
+  { 
+    std::cout << "Exception bad_alloc : "<<(char*)err.what()<< std::endl; 
+    return EXIT_FAILURE;
+  } 
+  catch( ... ) 
+  { 
+    std::cout << "Exception levee inconnue !" << std::endl; 
+    return EXIT_FAILURE;
+  } 
+  return EXIT_SUCCESS;
+}//Fin main()
+

Testing/Code/Projections/otbProjectionsTests2.cxx

@@ -30,6 +30,7 @@ void RegisterTests()
 REGISTER_TEST(otbOrthoRectificationFilterNew);
 REGISTER_TEST(otbOrthoRectificationFilter);
 REGISTER_TEST(otbOrthoRectificationFilterWithDEM);
+ REGISTER_TEST(otbOrthoRectificationMonoThreadFilter);
 //REGISTER_TEST(otbSensorImageToCarto);
 //REGISTER_TEST(otbSensorImageDEMToCarto);
 }