Skip to content
Snippets Groups Projects

Resolve "Migrate code to OTB 8.x"

Merged Luc Hermitte requested to merge 5-migrate-code-to-otb-8-x into master
1 file
+ 8
25
Compare changes
  • Side-by-side
  • Inline
@@ -105,7 +105,7 @@ SARDEMProjectionImageFilter2< TImageIn ,TImageOut >
#endif
/**
* Method GenerateOutputInformaton()
* Method GenerateOutputInformation()
*/
template<class TImageIn, class TImageOut>
void
@@ -145,10 +145,10 @@ SARDEMProjectionImageFilter2< TImageIn, TImageOut >
// m_withSatPos = true => 3 Three components added : Satellite Position into cartesian
#if OTB_VERSION_MAJOR >= 8
inputKwl.Add(std::string("band.L"), std::to_string(1));
inputKwl.Add(std::string("band.C"), std::to_string(0));
inputKwl.Add(std::string("band.Z"), std::to_string(2));
inputKwl.Add(std::string("band.Y"), std::to_string(3));
inputKwl.Add("band.L", "1");
inputKwl.Add("band.C", "0");
inputKwl.Add("band.Z", "2");
inputKwl.Add("band.Y", "3");
#else
// Fill KeyWordList
inputKwl.AddKey("support_data.band.L", "1");
@@ -324,7 +324,7 @@ SARDEMProjectionImageFilter2< TImageIn, TImageOut >
// Check if NODATA
if (InIt.Get() != m_NoData)
{
// Trnasform index to Lat/Lon Point
// Transform index to Lat/Lon Point
this->GetInput()->TransformIndexToPhysicalPoint(InIt.GetIndex(), demLatLonPoint);
demGeoPoint[0] = demLatLonPoint[0];
demGeoPoint[1] = demLatLonPoint[1];
@@ -401,11 +401,6 @@ SARDEMProjectionImageFilter2< TImageIn, TImageOut >
pixelOutput[m_indSatPos+1] = satPos[1];
pixelOutput[m_indSatPos+2] = satPos[2];
}
// Set the output (without iterator because no VectorImage into iterator template)
OutIt.Set(pixelOutput);
progress.CompletedPixel();
}
else
{
@@ -414,12 +409,12 @@ SARDEMProjectionImageFilter2< TImageIn, TImageOut >
{
pixelOutput[id] = m_NoData;
}
// Set the output (without itertor because no VectorImage into iterator template)
OutIt.Set(pixelOutput);
progress.CompletedPixel();
}
// Set the output (without iterator because no VectorImage into iterator template)
OutIt.Set(pixelOutput);
progress.CompletedPixel();
// Next Col
++InIt;
++OutIt;
Loading