From 738b6627ab61dce3641dc62b729ac643defbb1a7 Mon Sep 17 00:00:00 2001
From: Victor Poughon <victor.poughon@cnes.fr>
Date: Wed, 10 May 2017 08:52:17 +0200
Subject: [PATCH] DOC: Translate some remaining french comments
---
Documentation/SoftwareGuide/Latex/Abstract.tex | 15 ---------------
Examples/IO/ExtractROI.cxx | 2 +-
.../include/otbOGRDataSourceWrapper.h | 2 +-
.../GdalAdapters/include/otbOGRFeatureWrapper.h | 2 +-
.../GdalAdapters/include/otbOGRFieldWrapper.h | 2 +-
.../GdalAdapters/include/otbOGRLayerWrapper.h | 2 +-
.../test/otbTestCommandLineArgumentParserHelp.cxx | 1 -
.../Core/Common/include/otbModelComponentBase.h | 2 +-
.../Core/ImageBase/include/otbExtractROIBase.txx | 7 +++++--
.../otbImageOfVectorsToMonoChannelExtractROI.h | 2 +-
.../include/otbMultiToMonoChannelExtractROI.h | 2 +-
.../include/otbMultiToMonoChannelExtractROI.txx | 2 +-
.../test/otbMultiToMonoChannelExtractROI.cxx | 2 +-
.../Core/Transform/include/otbSensorModelBase.h | 2 +-
...gramOfOrientedGradientCovariantImageFunction.h | 2 +-
.../include/otbLineDetectorImageFilterBase.txx | 2 +-
.../include/otbMNFImageFilter.h | 2 +-
.../include/otbNAPCAImageFilter.h | 2 +-
.../ImageNoise/include/otbLeeImageFilter.h | 2 +-
...tbMultiChannelsPolarimetricSynthesisFilter.txx | 2 +-
.../Wavelet/include/otbWaveletFilterBank.txx | 2 +-
.../include/otbLocalRxDetectorNonThreadFilter.txx | 3 ---
Modules/IO/ImageIO/include/otbImageFileReader.txx | 11 +++++------
.../include/otbGaussianModelComponent.h | 2 +-
.../include/otbImageSimulationMethod.txx | 4 ++--
.../src/ossim/ossimCosmoSkymedModel.cpp | 2 +-
.../src/ossim/ossimEnvisatAsarModel.cpp | 2 +-
.../src/ossim/ossimPleiadesDimapSupportData.cpp | 4 ++--
.../src/ossim/ossimSpot6DimapSupportData.cpp | 4 ++--
.../OssimPlugins/src/ossim/otb/CivilDateTime.h | 6 +++---
.../src/ossim/otb/GalileanEphemeris.h | 2 +-
.../src/ossim/otb/GeographicEphemeris.h | 2 +-
.../OssimPlugins/src/ossim/otb/JSDDateTime.h | 2 +-
.../OssimPlugins/src/ossim/otb/JulianDate.h | 2 +-
.../OssimPlugins/src/ossim/otb/PlatformPosition.h | 2 +-
RELEASE_NOTES.txt | 2 +-
36 files changed, 46 insertions(+), 63 deletions(-)
diff --git a/Documentation/SoftwareGuide/Latex/Abstract.tex b/Documentation/SoftwareGuide/Latex/Abstract.tex
index e9ed4ef50f..a518839da8 100644
--- a/Documentation/SoftwareGuide/Latex/Abstract.tex
+++ b/Documentation/SoftwareGuide/Latex/Abstract.tex
@@ -62,18 +62,3 @@ source license Apache v2.0 - aka Apache Software License (ASL) v2.0:\\
OTB is implemented in C++ and is mainly based on
ITK\footnote{http://www.itk.org} (Insight Toolkit).
-
-%% L'environnement de l'OTB est mis en place par l'outil CMake\footnote{http://www.cmake.org},
-%% permettant ainsi de g\'{e}rer les proc\'{e}dures de compilation, g\'{e}n\'{e}ration et d'installation et ce quelque sois la plate forme cible.
-
-%% Dans un souci d'homog\'{e}n\'{e}isation, l'OTB est con\c{c}ue et d\'{e}velopp\'{e}e suivant la philosophie et les principes \'{e}dict\'{e}s
-%% par la biblioth\`{e}que ITK (programmation g\'{e}n\'{e}rique, m\'{e}canisme des \emph{Object Factories}, \emph{Smart pointers}, exceptions, \emph{Multi-Threading}, etc...).
-%% Ces principes sont pr\'{e}sent\'{e}s dans le paragraphe \emph{3.2 Essential System Concepts} du guide ITK \url{http://www.itk.org/ItkSoftwareGuide.pdf}
-
-%% Enfin, la m\'{e}thodologie de d\'{e}veloppement appliqu\'{e}e s'appuie sur une approche it\'{e}rative bas\'{e}e sur la programmation agile :
-%% le sch\'{e}ma de d\'{e}veloppement suit le cycle \'{e}dict\'{e}e par la m\'{e}thodolgie de l'eXtreme Programming (XP)\footnote{http://www.xprogramming.com}.
-
-
-
-%% Ce document constitue le guide d'utilisation et de d\'{e}veloppement de l'OTB. La version la plus r\'{e}cente de ce document est accessible \`{a}
-%% \url{http://smsc.cnes.fr/PLEIADES/Fr/A_prog_accomp.htm/OTB/otbSoftwareGuide.pdf}.
diff --git a/Examples/IO/ExtractROI.cxx b/Examples/IO/ExtractROI.cxx
index 14792437f4..041ba511a4 100644
--- a/Examples/IO/ExtractROI.cxx
+++ b/Examples/IO/ExtractROI.cxx
@@ -242,7 +242,7 @@ int main(int argc, char * argv[])
monoWriterType::Pointer monoWriter = monoWriterType::New();
monoReader->SetFileName(inputFilename);
- monoReader->Update(); //Necessaire pour connaitre le nombre de canaux dans l'image
+ monoReader->Update(); // Needed to know the number of channels in the image
monoWriter->SetFileName(outputFilenameMIR);
extractROIMonoFilter->SetInput(monoReader->GetOutput());
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.h
index 9fbc47e325..bf6d799fd5 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.h
@@ -492,7 +492,7 @@ public:
* underlying \c GDALDataset is required.
* \pre The underlying \c GDALDataset must be valid, i.e.
* <tt>m_DataSource != 0</tt>, an assertion is fired otherwise.
- * \warning You must under no circonstance try to delete the \c GDALDataset
+ * \warning You must under no circumstance try to delete the \c GDALDataset
* obtained this way.
*/
ogr::version_proxy::GDALDatasetType & ogr();
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.h
index 0e4e68e900..945241bda3 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.h
@@ -142,7 +142,7 @@ public:
* underlying \c OGRFeature is required.
* \invariant The underlying \c OGRFeature must be valid, i.e.
* <tt>m_DataSource != 0</tt>, an assertion is fired otherwise.
- * \warning You must under no circonstance try to delete the \c OGRFeature
+ * \warning You must under no circumstance try to delete the \c OGRFeature
* obtained this way.
*/
OGRFeature & ogr() const;
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.h
index 2e7e56f593..8b3f627571 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.h
@@ -175,7 +175,7 @@ public:
/** Access to the raw underlying OGR data.
* This function provides an abstraction leak in case deeper control on the
* underlying \c OGRFeature is required.
- * \warning You must under no circonstance try to delete the \c OGRField
+ * \warning You must under no circumstance try to delete the \c OGRField
* obtained this way.
*/
OGRField & ogr() const;
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h
index 6c129b9831..8ebd74cc85 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h
@@ -242,7 +242,7 @@ public:
* underlying \c OGRLayer is required.
* \pre The underlying \c OGRLayer must be valid, i.e.
* <tt>m_Layer != 0</tt>, an assertion is fired otherwise.
- * \warning You must under no circonstance try to delete the \c OGRLayer
+ * \warning You must under no circumstance try to delete the \c OGRLayer
* obtained this way.
*/
OGRLayer & ogr();
diff --git a/Modules/Core/CommandLineParser/test/otbTestCommandLineArgumentParserHelp.cxx b/Modules/Core/CommandLineParser/test/otbTestCommandLineArgumentParserHelp.cxx
index 7b27a8b128..454fc55953 100644
--- a/Modules/Core/CommandLineParser/test/otbTestCommandLineArgumentParserHelp.cxx
+++ b/Modules/Core/CommandLineParser/test/otbTestCommandLineArgumentParserHelp.cxx
@@ -24,7 +24,6 @@
#include "itkMacro.h"
#include "otbCommandLineArgumentParser.h"
-// Test de sortie en erreur
int otbTestCommandLineArgumentParserHelp(int argc, char * argv[])
{
try
diff --git a/Modules/Core/Common/include/otbModelComponentBase.h b/Modules/Core/Common/include/otbModelComponentBase.h
index 58b3642f87..c23c5a0062 100644
--- a/Modules/Core/Common/include/otbModelComponentBase.h
+++ b/Modules/Core/Common/include/otbModelComponentBase.h
@@ -126,7 +126,7 @@ public:
/** Show the parameters in a minimal form in comparison to PrintSelf */
virtual void ShowParameters(std::ostream& os, itk::Indent indent) const;
- // TODO: Distance entre distribution via une sorte de fonction membre...
+ // TODO: Distance between distribtions with some kind of member function...
protected:
ModelComponentBase();
diff --git a/Modules/Core/ImageBase/include/otbExtractROIBase.txx b/Modules/Core/ImageBase/include/otbExtractROIBase.txx
index 655be5fa6f..b7c6e0e2a8 100644
--- a/Modules/Core/ImageBase/include/otbExtractROIBase.txx
+++ b/Modules/Core/ImageBase/include/otbExtractROIBase.txx
@@ -307,10 +307,13 @@ ExtractROIBase<TInputImage, TOutputImage>
outputPtr->SetSpacing(outputSpacing);
outputPtr->SetDirection(outputDirection);
outputPtr->SetOrigin(outputOrigin);
-// THOMAS : dans ITK ce code est present, mais pas dans notre cas, car le nombre de composantes/pixel depend des canaux selectionnes par l'utilisateur
-// ce parametre est renseignes dans les classes sous-jacentes
+
+// Thomas Feuvrier:
+// ITK has this code. But not in our case, because the number of component per pixel depends on the bands selected by the user.
+// This parameter is given in the underlying classes.
// outputPtr->SetNumberOfComponentsPerPixel(
// inputPtr->GetNumberOfComponentsPerPixel() );
+//
}
} // end namespace otb
diff --git a/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h b/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h
index 1a312c52e9..21910ccb70 100644
--- a/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h
+++ b/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h
@@ -74,7 +74,7 @@ public:
typedef typename OutputImageType::SizeType OutputImageSizeType;
typedef typename InputImageType::SizeType InputImageSizeType;
- /** Selectionne le canal a traiter */
+ /** Select the channel to process */
itkSetMacro(Channel, unsigned int);
itkGetConstMacro(Channel, unsigned int);
diff --git a/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h b/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h
index 65dd42179b..2724bcf8e6 100644
--- a/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h
+++ b/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h
@@ -81,7 +81,7 @@ public:
typedef typename OutputImageType::SizeType OutputImageSizeType;
typedef typename InputImageType::SizeType InputImageSizeType;
- /** Selectionne le canal a traiter */
+ /** Select the channel to process */
itkSetMacro(Channel, unsigned int);
itkGetConstMacro(Channel, unsigned int);
diff --git a/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.txx b/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.txx
index 6ba3fd87c0..2d2ff06047 100644
--- a/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.txx
+++ b/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.txx
@@ -101,7 +101,7 @@ MultiToMonoChannelExtractROI<TInputPixelType, TOutputPixelType>
OutputIterator outIt(outputPtr, outputRegionForThread);
InputIterator inIt(inputPtr, inputRegionForThread);
- // Parcours des canaux a traiter
+ // Go through channels to process
const unsigned int channelIn(m_Channel - 1);
while (!outIt.IsAtEnd())
diff --git a/Modules/Core/ImageBase/test/otbMultiToMonoChannelExtractROI.cxx b/Modules/Core/ImageBase/test/otbMultiToMonoChannelExtractROI.cxx
index b454cb39bb..a47f7b3cdb 100644
--- a/Modules/Core/ImageBase/test/otbMultiToMonoChannelExtractROI.cxx
+++ b/Modules/Core/ImageBase/test/otbMultiToMonoChannelExtractROI.cxx
@@ -87,7 +87,7 @@ int generic_otbMultiToMonoChannelExtractROI(int itkNotUsed(argc),
reader->SetFileName(inputFilename);
//THOMAS
- // reader->Update(); //Necessaire pour connaitre le nombre de canaux dans l'image
+ // reader->Update(); // Needed to know the number of channels in the image
writer->SetFileName(outputFilename);
extractROIFilter->SetInput(reader->GetOutput());
diff --git a/Modules/Core/Transform/include/otbSensorModelBase.h b/Modules/Core/Transform/include/otbSensorModelBase.h
index 5b73cb1971..07d4e2353f 100644
--- a/Modules/Core/Transform/include/otbSensorModelBase.h
+++ b/Modules/Core/Transform/include/otbSensorModelBase.h
@@ -36,7 +36,7 @@ namespace otb
* \brief Base class for the sensor model projection classes.
*
* This class allows transforming a geographic point in (lat, long) to a point
- * in the sensor geometry. (lat, lon) -> (i, j) ou (lat, lon, h) -> (i, j)
+ * in the sensor geometry. (lat, lon) -> (i, j) or (lat, lon, h) -> (i, j)
*
* \ingroup Projection
*
diff --git a/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.h b/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.h
index ebe27294d8..6a464dd648 100644
--- a/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.h
+++ b/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.h
@@ -59,7 +59,7 @@ namespace otb
* all lie in the range $[0, 1]$.
*
* This class is templated over the input image type, the output
- * precision (e.g. float ou double) and the
+ * precision (e.g. float or double) and the
* coordinate representation type (e.g. float or double).
* \ingroup ImageFunctions
diff --git a/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.txx b/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.txx
index c98f2baa40..7fb19ba39c 100644
--- a/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.txx
+++ b/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.txx
@@ -52,7 +52,7 @@ LineDetectorImageFilterBase<TInputImage, TOutputImage, TOutputImageDirection, In
m_Threshold = 0;
m_NumberOfDirections = 4;
m_FaceList.Fill(0);
-// THOMAS : donc contructeur de base
+// THOMAS : hence base constructor
// this->SetNthOutput(0, OutputImageType::New());
// this->SetNthOutput(1, OutputImageType::New());
}
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.h
index ab384e32fc..50557f1fe2 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.h
@@ -35,7 +35,7 @@ namespace otb {
* The high pass filter which has to be used for the noise estimation is templated
* for a better scalability.
*
- * TODO? Utiliser une 2e entree pour donner directement une image de bruit ?
+ * TODO? Use a 2nd input to give a noise image directly?
*
* \sa otbStreamingStatisticsVectorImageFilter
* \sa PCAImageFiler
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.h
index 6f1e4b9e38..c7847771c3 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.h
@@ -38,7 +38,7 @@ namespace otb {
* matrix definition (through GenerateTransformationMatrix function)
* differs.
*
- * TODO? Utiliser une 2e entree pour donner directement une image de bruit ??
+ * TODO? Use a 2nd input to give a noise image directly?
*
* \sa otbStreamingStatisticsVectorImageFilter
* \sa MNFImageFilter
diff --git a/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.h b/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.h
index 0383ed56c8..6479cc5e2d 100644
--- a/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.h
+++ b/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.h
@@ -111,7 +111,7 @@ protected:
* LEE filter:
*\f$ R = E[I] + b(I-E[I])\f$ with \f$ b = C^2r / ( C^2r + C^2v )\f$
* \f$ Cv = 1 / \sqrt(L) \f$ with L the number of look.
- * \f$ Cr = \sqrt(Var(I)) / E[I] avec Var(I) = E[I^2] - E[I]^2 \f$
+ * \f$ Cr = \sqrt(Var(I)) / E[I] where Var(I) = E[I^2] - E[I]^2 \f$
*
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
diff --git a/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.txx b/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.txx
index 85f5407b28..4a5c0edc8f 100644
--- a/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.txx
+++ b/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.txx
@@ -191,7 +191,7 @@ MultiChannelsPolarimetricSynthesisFilter<TInputImage, TOutputImage, TFunction>
}
break;
- // With 3 channels : HH HV VV ou HH VH VV
+ // With 3 channels : HH HV VV or HH VH VV
case HH_HV_VV:
while (!inputIt.IsAtEnd())
{
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.txx b/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.txx
index 31ce15baf6..5dcf3cfb46 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.txx
+++ b/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.txx
@@ -230,7 +230,7 @@ WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD>
destRegion.SetSize(destSize);
#if 0
- // Contrairement a Wavelet::INVERSE, ici ca ne sera a rien apparemment...
+ // Contrary to Wavelet::INVERSE, this is useless apparently...
// Region Padding
LowPassOperatorType lowPassOperator;
diff --git a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.txx b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.txx
index c4d02c240a..8f306108d1 100644
--- a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.txx
+++ b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.txx
@@ -112,9 +112,6 @@ LocalRxDetectorNonThreadFilter<TInputImage, TOutputImage>
ImageRegionIteratorType outputIt(outputPtr, *fit);
- //std::cout << "Region de la face list : " << *vectorFit << std::endl;
- //std::cout << "Region dans le buffer : " << inputPtr->GetBufferedRegion() << std::endl;
-
// Run Input Image
for (inputIt.GoToBegin(), outputIt.GoToBegin(); !inputIt.IsAtEnd(); ++inputIt, ++outputIt)
{
diff --git a/Modules/IO/ImageIO/include/otbImageFileReader.txx b/Modules/IO/ImageIO/include/otbImageFileReader.txx
index cf647aac63..8f529967ad 100644
--- a/Modules/IO/ImageIO/include/otbImageFileReader.txx
+++ b/Modules/IO/ImageIO/include/otbImageFileReader.txx
@@ -359,9 +359,9 @@ ImageFileReader<TOutputImage, ConvertPixelTraits>
//
this->m_ImageIO->SetFileName(this->m_FileName.c_str());
this->m_ImageIO->ReadImageInformation();
- // Initialization du nombre de Composante par pixel
-// THOMAS ceci n'est pas dans ITK !!
-// output->SetNumberOfComponentsPerPixel(this->m_ImageIO->GetNumberOfComponents());
+ // Initialize the number of component per pixel
+ // THOMAS: This is not in ITK!
+ // output->SetNumberOfComponentsPerPixel(this->m_ImageIO->GetNumberOfComponents());
SizeType dimSize;
double spacing[TOutputImage::ImageDimension];
@@ -659,7 +659,7 @@ ImageFileReader<TOutputImage, ConvertPixelTraits>
std::string str_FileName;
bool fic_trouve(false);
- // Si c'est un repertoire, on regarde le contenu pour voir si c'est pas du RADARSAT, ERS
+ // If it's a directory, look at the content to see if it's RADARSAT, ERS
std::vector<std::string> listFileFind;
listFileFind = System::Readdir(filename);
if (listFileFind.empty() == false)
@@ -686,12 +686,11 @@ ImageFileReader<TOutputImage, ConvertPixelTraits>
std::string extension = itksys::SystemTools::GetFilenameLastExtension(strFileName);
if ((extension == ".HDR") || (extension == ".hdr"))
{
- //Supprime l'extension
GdalFileName = System::GetRootName(strFileName);
}
else
{
- // Sinon le filename est le nom du fichier a ouvrir
+ // Else, the filename is the name of the file to open
GdalFileName = std::string(filename);
}
fic_trouve = true;
diff --git a/Modules/Learning/LearningBase/include/otbGaussianModelComponent.h b/Modules/Learning/LearningBase/include/otbGaussianModelComponent.h
index 2904d0c388..58472ddf43 100644
--- a/Modules/Learning/LearningBase/include/otbGaussianModelComponent.h
+++ b/Modules/Learning/LearningBase/include/otbGaussianModelComponent.h
@@ -101,7 +101,7 @@ private:
void operator =(const Self&); //purposely not implemented
typename NativeMembershipFunctionType::Pointer m_GaussianMembershipFunction;
- // TODO ajouter un m_GaussianCumulativeFunction
+ // TODO add a m_GaussianCumulativeFunction
typename CovarianceEstimatorType::Pointer m_CovarianceEstimator;
MeanVectorType m_Mean;
diff --git a/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.txx b/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.txx
index ee58c5f598..d42b05f94b 100644
--- a/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.txx
+++ b/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.txx
@@ -39,8 +39,8 @@ ImageSimulationMethod< TInputVectorData, TSpatialisation, TSimulationStep1, TSim
// this->SetNthOutput(0, OutputImageType::New());
// this->SetNthOutput(1, OutputLabelImageType::New());
- //TODO a changer mais pour le moment obligatoire car ProlateInterpolateImageFunction
- // ne fonctionne qu'avec des images mono canal.
+ // TODO fix this. But for now this is mandatory because ProlateInterpolateImageFunction
+ // only works with single channel images.
// m_FTMFilter = FTMFilterType::New();
// m_Interpolator = InterpolatorType::New();
// m_MultiToMonoChannelFilter = MultiToMonoChannelFilterType::New();
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimCosmoSkymedModel.cpp b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimCosmoSkymedModel.cpp
index 30cbcff6e4..8e7671c963 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimCosmoSkymedModel.cpp
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimCosmoSkymedModel.cpp
@@ -99,7 +99,7 @@ bool ossimCosmoSkymedModel::InitSensorParams(const ossimKeywordlist &kwl, const
/**
- * @todo : � voir sur de vrais produits (exemples de DESCENDING et ASCENDING)
+ * @todo : see on real products (for exemple DESCENDING and ASCENDING)
*/
const char* orbitDirection_str = kwl.find(prefix,"orbitDirection");
std::string orbitDirection(orbitDirection_str) ;
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimEnvisatAsarModel.cpp b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimEnvisatAsarModel.cpp
index dacf39e15f..78b29111d8 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimEnvisatAsarModel.cpp
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimEnvisatAsarModel.cpp
@@ -404,7 +404,7 @@ namespace ossimplugins
fa = 1.0/atof(fa_str);
}
- // TODO : v�rifier que ceci est ok pour les produits IMP
+ // TODO check that this is OK for IMP products
const char* time_dir_pix = "INCREASE";
const char* time_dir_lin = "INCREASE";
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimPleiadesDimapSupportData.cpp b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimPleiadesDimapSupportData.cpp
index aea732d0fd..7df7258244 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimPleiadesDimapSupportData.cpp
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimPleiadesDimapSupportData.cpp
@@ -2762,7 +2762,7 @@ namespace ossimplugins
vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
//---
- // Fetch the mission index (1A ou 1B) ?
+ // Fetch the mission index (1A or 1B) ?
// and generate theSensorID
//---
if (theDIMAPVersion == OSSIM_PLEIADES_DIMAPv1)
@@ -2790,7 +2790,7 @@ namespace ossimplugins
}
//---
- // Fetch the mission index (1A ou 1B) ?
+ // Fetch the mission index (1A or 1B) ?
// and generate theSensorID
//---
if (theDIMAPVersion == OSSIM_PLEIADES_DIMAPv1)
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSpot6DimapSupportData.cpp b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSpot6DimapSupportData.cpp
index 7eb4ea97e2..490c0627a1 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSpot6DimapSupportData.cpp
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSpot6DimapSupportData.cpp
@@ -2127,7 +2127,7 @@ namespace ossimplugins
vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
//---
- // Fetch the mission index (1A ou 1B) ?
+ // Fetch the mission index (1A or 1B) ?
// and generate theSensorID
//---
xpath = "/Dataset_Sources/Source_Identification/Strip_Source/MISSION";
@@ -2148,7 +2148,7 @@ namespace ossimplugins
}
//---
- // Fetch the mission index (1A ou 1B) ?
+ // Fetch the mission index (1A or 1B) ?
// and generate theSensorID
//---
xpath = "/Dataset_Sources/Source_Identification/Strip_Source/MISSION_INDEX"; //DIMAPv2
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/otb/CivilDateTime.h b/Modules/ThirdParty/OssimPlugins/src/ossim/otb/CivilDateTime.h
index 73882463d7..e363b9bc71 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/otb/CivilDateTime.h
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/otb/CivilDateTime.h
@@ -80,21 +80,21 @@ public:
/**
* @brief This function converts the current CivilDateTime into Julian Date
* @return 0 if no error or an int greater than 0 indicating the error
- * @param julianDate [out] The classe that receives the result of the conversion of the current CivilDateTime into JulianDate
+ * @param julianDate [out] The class that receives the result of the conversion of the current CivilDateTime into JulianDate
*/
int AsJulianDate(JulianDate* julianDate);
/**
* @brief This function converts the current CivilDateTime into JSDDateTime
* @return 0 if no error or an int greater than 0 indicating the error
- * @param JSDdate [out] The classe that receives the result of the conversion of the current CivilDateTime into JSDDateTime
+ * @param JSDdate [out] The class that receives the result of the conversion of the current CivilDateTime into JSDDateTime
*/
int AsJSDDateTime(JSDDateTime* JSDdate);
/**
* @brief This function converts the current CivilDateTime into GMSTDateTime
* @return 0 if no error or an int greater than 0 indicating the error
- * @param GMSTdate [out] The classe that receives the result of the conversion of the current CivilDateTime into GMSTDateTime
+ * @param GMSTdate [out] The class that receives the result of the conversion of the current CivilDateTime into GMSTDateTime
*/
int AsGMSTDateTime(GMSTDateTime* GMSTdate);
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/otb/GalileanEphemeris.h b/Modules/ThirdParty/OssimPlugins/src/ossim/otb/GalileanEphemeris.h
index d9fc83125e..251aeb209c 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/otb/GalileanEphemeris.h
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/otb/GalileanEphemeris.h
@@ -68,7 +68,7 @@ public:
GalileanEphemeris& operator=(const GalileanEphemeris& rhs);
/**
- * @brief This fonction converts the current ephemeris in the Geographic coordinates syst�m
+ * @brief This function converts the current ephemeris in the Geographic coordinates system
*/
void ToGeographic(GeographicEphemeris* vGeo);
void ToGeographic(double greenwich,GeographicEphemeris* vGeo);
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/otb/GeographicEphemeris.h b/Modules/ThirdParty/OssimPlugins/src/ossim/otb/GeographicEphemeris.h
index e7daea9b7f..465b5d9ff2 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/otb/GeographicEphemeris.h
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/otb/GeographicEphemeris.h
@@ -66,7 +66,7 @@ public:
GeographicEphemeris& operator=(const GeographicEphemeris& rhs);
/**
- * @brief This fonction converts the current ephemeris in the Galilean coordinates system
+ * @brief This function converts the current ephemeris in the Galilean coordinates system
*/
void ToGalilean(GalileanEphemeris* vGal);
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/otb/JSDDateTime.h b/Modules/ThirdParty/OssimPlugins/src/ossim/otb/JSDDateTime.h
index d5154ee778..8f6b251a33 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/otb/JSDDateTime.h
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/otb/JSDDateTime.h
@@ -117,7 +117,7 @@ public:
/**
* @brief This function converts the current JSDDateTime into Julian Date
* @return 0 if no error or an int greater than 0 indicating the error
- * @param julianDate [out] The classe that receives the result of the conversion of the current JSDDateTime in JulianDate
+ * @param julianDate [out] The class that receives the result of the conversion of the current JSDDateTime in JulianDate
*/
int AsJulianDate(JulianDate* julian);
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/otb/JulianDate.h b/Modules/ThirdParty/OssimPlugins/src/ossim/otb/JulianDate.h
index c4a68e2fe6..6c99837316 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/otb/JulianDate.h
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/otb/JulianDate.h
@@ -89,7 +89,7 @@ public:
/**
* @brief This function converts the current JulianDate in JSDDateTime
* @return 0 if no error or an int greater than 0 indicating the error
- * @param JSDdate [out] The classe that receives the result of the conversion of the current JulianDate in JSDDateTime
+ * @param JSDdate [out] The class that receives the result of the conversion of the current JulianDate in JSDDateTime
*/
int AsJSDDateTime(JSDDateTime* JSDdate);
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/otb/PlatformPosition.h b/Modules/ThirdParty/OssimPlugins/src/ossim/otb/PlatformPosition.h
index b41072e1e3..7568315830 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/otb/PlatformPosition.h
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/otb/PlatformPosition.h
@@ -66,7 +66,7 @@ namespace ossimplugins
* @param nbrData Number of Ephemeris in data
* @remarks All the ephemeris have to be in the same coordinates system
* @remarks This constructor copy the content of data, so it's the
- * calling fonction that have to manage the memory of data.
+ * calling function that have to manage the memory of data.
*/
PlatformPosition(Ephemeris** data, int nbrData);
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index a36bd9399f..edeb2e1bb5 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -2339,7 +2339,7 @@ OTB-v.2.4.0 - Changes since version 2.2.0 (2008/07/24)
*Common:
Extraction ROI Classes :
- - Lifting of the otbExtractionBase classe
+ - Lifting of the otbExtractionBase class
- Correction of the SetExtractionRegion method
*BasicFilters:
--
GitLab