MRG: servers problems -> merge

Code/BasicFilters/otbMeanShiftImageFilter2.h

@@ -102,7 +102,6 @@ class NormL2
 };
 
 
-
 template <class TInputImage, class TOutputImage, class TKernel = KernelUniform, class TNorm = NormL2, class TOutputMetricImage = TOutputImage, class TOutputIterationImage = otb::Image<unsigned int, TInputImage::ImageDimension> >
 class ITK_EXPORT MeanShiftImageFilter2
   : public itk::ImageToImageFilter<TInputImage, TOutputImage>
@@ -239,7 +238,6 @@ private:
   // };
 
 
-
   /** Range bandwidth */
   RealType        m_RangeBandwidth;
 

Code/OBIA/otbFusionOGRTileFilter.txx

@@ -88,7 +88,7 @@ FusionOGRTileFilter<TImage>
       {
          /*std::cout<< " column tile number : " << x*y <<std::endl;
          itk::TimeProbe chrono;
-         chrono.Start();*/
+         chrono.Start(); */
   
          //First compute the intersection between polygons and the streaming line (upper stream)
          std::vector<FeatureStruct> upperStreamFeatureList;
@@ -253,7 +253,7 @@ FusionOGRTileFilter<TImage>
          }
       
       /*chrono.Stop();
-      std::cout<< "Column fusion tile took " << chrono.GetTotal() << " sec"<<std::endl;*/
+      std::cout<< "Column fusion tile took " << chrono.GetTotal() << " sec"<<std::endl; */
   
       } //end for x
    } //end for y
@@ -268,7 +268,7 @@ FusionOGRTileFilter<TImage>
       {
          /*std::cout<< " line tile number : " << x*y <<std::endl;
          itk::TimeProbe chrono;
-         chrono.Start();*/
+         chrono.Start(); */
          
          //First compute the intersection between polygons and the streaming line (upper stream)
          std::vector<FeatureStruct> upperStreamFeatureList;
@@ -431,7 +431,7 @@ FusionOGRTileFilter<TImage>
       
       
       /*chrono.Stop();
-      std::cout<< "line fusion tile took " << chrono.GetTotal() << " sec"<<std::endl;*/
+      std::cout<< "line fusion tile took " << chrono.GetTotal() << " sec"<<std::endl; */
       
       } //end for x
    } //end for y

Code/OBIA/otbPersistentImageToOGRDataFilter.txx

@@ -154,7 +154,7 @@ PersistentImageToOGRDataFilter<TImage>
       /*char ** options = NULL;
       char * opt = "SPATIALITE=YES";
       options = CSLAddString(options, opt );
-      m_DataSource = ogrDriver->CreateDataSource(this->m_FileName.c_str(), &options[0]);*/
+      m_DataSource = ogrDriver->CreateDataSource(this->m_FileName.c_str(), &options[0]); */
       
       m_DataSource->CreateLayer("layer", oSRS ,wkbMultiPolygon, NULL);
       

Code/Testing/otbCurlHelperStub.cxx

@@ -33,7 +33,7 @@ bool CurlHelperStub::TestUrlAvailability(const std::string& url) const
 
 int CurlHelperStub::RetrieveUrlInMemory(const std::string& url, std::string& output) const
 {
-  if (url.compare("http://ws.geonames.org/findNearbyPlaceName?lat=1.29&lng=103.78") == 0)
+  if (url.compare("http://api.geonames.org/findNearbyPlaceName?lat=1.29&lng=103.78&username=otbteam") == 0)
     {
     output = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
         "<geonames>\n"
@@ -58,7 +58,7 @@ int CurlHelperStub::RetrieveUrlInMemory(const std::string& url, std::string& out
 
 int CurlHelperStub::RetrieveFile(const std::ostringstream& urlStream, std::string filename) const
 {
-  if (urlStream.str().compare("http://ws.geonames.org/findNearbyPlaceName?lat=1.29&lng=103.78") == 0)
+  if (urlStream.str().compare("http://api.geonames.org/findNearbyPlaceName?lat=1.29&lng=103.78&username=otbteam") == 0)
     {
     std::ofstream file;
     file.open(filename.c_str());