From 390a553b05800aada9e6d9c1a120678640ec7a8d Mon Sep 17 00:00:00 2001 From: Rashad Kanavath <rashad.kanavath@c-s.fr> Date: Tue, 29 Mar 2016 14:45:58 +0200 Subject: [PATCH] DOC: Apply spelling-errors.patch from Mantis-1143. This patch is authored by Bas Couwenberg <sebastic@xs4all.nl> from DebianGIS team. spelling errors were encountered when updating OTB debian package for 5.2.1. https://bugs.orfeo-toolbox.org/view.php?id=1143 --- .../src/otbOGRGeometryWrapper.cxx | 2 +- .../app/otbHomologousPointsExtraction.cxx | 6 +++--- .../AppImageUtils/app/otbColorMapping.cxx | 2 +- .../app/otbGridBasedImageResampling.cxx | 4 ++-- .../app/otbSARPolarMatrixConvert.cxx | 2 +- .../AppStereo/app/otbStereoFramework.cxx | 2 +- .../AppVectorUtils/app/otbOSMDownloader.cxx | 2 +- .../Common/include/otbRGBAPixelConverter.h | 2 +- .../otbVariableLengthVectorConverter.h | 2 +- .../ImageBase/include/otbConvertPixelBuffer.h | 2 +- ...ckLeiblerSupervizedDistanceImageFilter.txx | 20 +++++++++---------- ...ultivariateAlterationDetectorImageFilter.h | 2 +- .../include/otbVectorDataProjectionFilter.txx | 2 +- .../include/otbVectorDataTransformFilter.txx | 2 +- .../otbMeanShiftSmoothingImageFilter.h | 2 +- .../otbVectorDataToVectorDataFilter.txx | 2 +- Modules/IO/TestKernel/src/otbTestHelper.cxx | 2 +- .../include/otbRasterizeVectorDataFilter.h | 2 +- 18 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Modules/Adapters/GdalAdapters/src/otbOGRGeometryWrapper.cxx b/Modules/Adapters/GdalAdapters/src/otbOGRGeometryWrapper.cxx index 8e45c25c63..9d1689d9d7 100644 --- a/Modules/Adapters/GdalAdapters/src/otbOGRGeometryWrapper.cxx +++ b/Modules/Adapters/GdalAdapters/src/otbOGRGeometryWrapper.cxx @@ -27,7 +27,7 @@ #endif #ifdef _MSC_VER -// warning convertion int -> bool +// warning conversion int -> bool #pragma warning ( disable : 4800 ) #endif /*===========================================================================*/ diff --git a/Modules/Applications/AppDescriptors/app/otbHomologousPointsExtraction.cxx b/Modules/Applications/AppDescriptors/app/otbHomologousPointsExtraction.cxx index da550f0950..bc1c11ada2 100644 --- a/Modules/Applications/AppDescriptors/app/otbHomologousPointsExtraction.cxx +++ b/Modules/Applications/AppDescriptors/app/otbHomologousPointsExtraction.cxx @@ -88,7 +88,7 @@ private: " the first is the full mode where keypoints are extracted from the full extent of both images" " (please note that in this mode large image file are not supported). " "The second mode, called geobins, allows one to set-up spatial binning to get fewer points" - " spread accross the entire image. " + " spread across the entire image. " "In this mode, the corresponding spatial bin in the second image is estimated using geographical" " transform or sensor modelling, and is padded according to the user defined precision. Last, in" " both modes the application can filter matches whose colocalisation in first image exceed this precision. " @@ -142,8 +142,8 @@ private: AddChoice("mode.full","Extract and match all keypoints (no streaming)"); SetParameterDescription("mode.full","Extract and match all keypoints, loading both images entirely into memory"); - AddChoice("mode.geobins","Search keypoints in small spatial bins regularly spread accross first image"); - SetParameterDescription("mode.geobins","This method allows retrieving a set of tie points regulary spread accross image 1. Corresponding bins in image 2 are retrieved using sensor and geographical information if available. The first bin position takes into account the margin parameter. Bins are cropped to the largest image region shrinked by the margin parameter for both in1 and in2 images."); + AddChoice("mode.geobins","Search keypoints in small spatial bins regularly spread across first image"); + SetParameterDescription("mode.geobins","This method allows retrieving a set of tie points regulary spread across image 1. Corresponding bins in image 2 are retrieved using sensor and geographical information if available. The first bin position takes into account the margin parameter. Bins are cropped to the largest image region shrinked by the margin parameter for both in1 and in2 images."); AddParameter(ParameterType_Int,"mode.geobins.binsize","Size of bin"); SetParameterDescription("mode.geobins.binsize","Radius of the spatial bin in pixels"); diff --git a/Modules/Applications/AppImageUtils/app/otbColorMapping.cxx b/Modules/Applications/AppImageUtils/app/otbColorMapping.cxx index 003072414b..0d0ac332a7 100644 --- a/Modules/Applications/AppImageUtils/app/otbColorMapping.cxx +++ b/Modules/Applications/AppImageUtils/app/otbColorMapping.cxx @@ -22,7 +22,7 @@ #include <fstream> #include <map> -// Include differents method for color mapping +// Include different method for color mapping #include "otbChangeLabelImageFilter.h" #include "itkLabelToRGBImageFilter.h" #include "itkScalarToRGBColormapImageFilter.h" diff --git a/Modules/Applications/AppProjection/app/otbGridBasedImageResampling.cxx b/Modules/Applications/AppProjection/app/otbGridBasedImageResampling.cxx index dd2769e4dc..6f71f0ff77 100644 --- a/Modules/Applications/AppProjection/app/otbGridBasedImageResampling.cxx +++ b/Modules/Applications/AppProjection/app/otbGridBasedImageResampling.cxx @@ -205,7 +205,7 @@ void DoExecute() // deformation grid, which is the only type handled by StreamingWarpImageFilter if(GetParameterString("grid.type") == "loc") { - GetLogger()->Info("Grid intepreted as a location grid."); + GetLogger()->Info("Grid interpreted as a location grid."); m_ExtractX->SetInput(inGrid); m_ExtractX->SetChannel(1); m_BandMathX->SetNthInput(0,m_ExtractX->GetOutput(),"locX"); @@ -222,7 +222,7 @@ void DoExecute() } else { - GetLogger()->Info("Grid intepreted as a deformation grid."); + GetLogger()->Info("Grid interpreted as a deformation grid."); m_DisplacementFieldCaster->SetInput(inGrid); } diff --git a/Modules/Applications/AppSARPolarMatrixConvert/app/otbSARPolarMatrixConvert.cxx b/Modules/Applications/AppSARPolarMatrixConvert/app/otbSARPolarMatrixConvert.cxx index c670aabb0e..e0bd030abb 100644 --- a/Modules/Applications/AppSARPolarMatrixConvert/app/otbSARPolarMatrixConvert.cxx +++ b/Modules/Applications/AppSARPolarMatrixConvert/app/otbSARPolarMatrixConvert.cxx @@ -264,7 +264,7 @@ private: - AddParameter(ParameterType_Choice, "conv", "Convertion"); + AddParameter(ParameterType_Choice, "conv", "Conversion"); //Monostatic case diff --git a/Modules/Applications/AppStereo/app/otbStereoFramework.cxx b/Modules/Applications/AppStereo/app/otbStereoFramework.cxx index 04e76e9739..d1077c56bc 100644 --- a/Modules/Applications/AppStereo/app/otbStereoFramework.cxx +++ b/Modules/Applications/AppStereo/app/otbStereoFramework.cxx @@ -319,7 +319,7 @@ private: SetDocName("Stereo Framework"); SetDocLongDescription("Compute the ground elevation with a stereo block matching algorithm " - "between one or mulitple stereo pair in sensor geometry. The output is projected in " + "between one or multiple stereo pair in sensor geometry. The output is projected in " "desired geographic or cartographic map projection (UTM by default). The pipeline is made of the following steps:\n" "for each sensor pair :\n" "\t- compute the epipolar displacement grids from the stereo pair (direct and inverse)\n" diff --git a/Modules/Applications/AppVectorUtils/app/otbOSMDownloader.cxx b/Modules/Applications/AppVectorUtils/app/otbOSMDownloader.cxx index e3ef0a14e5..e163a34094 100644 --- a/Modules/Applications/AppVectorUtils/app/otbOSMDownloader.cxx +++ b/Modules/Applications/AppVectorUtils/app/otbOSMDownloader.cxx @@ -56,7 +56,7 @@ private: SetDocLongDescription("Generate a vector data from Open Street Map data. A DEM could be use. By default, the entire layer is downloaded, an image can be use as support for the OSM data. The application can provide also available classes in layers . This application required an Internet access. Information about the OSM project : http://www.openstreetmap.fr/"); SetDocLimitations("None"); SetDocAuthors("OTB-Team"); - SetDocSeeAlso("Convertion"); + SetDocSeeAlso("Conversion"); AddDocTag(Tags::Meta); diff --git a/Modules/Core/Common/include/otbRGBAPixelConverter.h b/Modules/Core/Common/include/otbRGBAPixelConverter.h index 932b4ba311..e3ee8bcf3e 100644 --- a/Modules/Core/Common/include/otbRGBAPixelConverter.h +++ b/Modules/Core/Common/include/otbRGBAPixelConverter.h @@ -30,7 +30,7 @@ namespace otb * \brief Convert an itk::RGBApixel<InternalType> into another pixel * type * - * To be usable, the desired convertion must be implemented through + * To be usable, the desired conversion must be implemented through * partial specialisation mecanism. * * diff --git a/Modules/Core/Common/include/otbVariableLengthVectorConverter.h b/Modules/Core/Common/include/otbVariableLengthVectorConverter.h index febc9c5d48..2c8f53a92d 100644 --- a/Modules/Core/Common/include/otbVariableLengthVectorConverter.h +++ b/Modules/Core/Common/include/otbVariableLengthVectorConverter.h @@ -31,7 +31,7 @@ namespace otb * \class VariableLengthVectorConverter * \brief Convert any data container type into a VariableLengthVector. * - * To be usable, the desired convertion must be implemented through + * To be usable, the desired conversion must be implemented through * partial specialisation mecanism. * * diff --git a/Modules/Core/ImageBase/include/otbConvertPixelBuffer.h b/Modules/Core/ImageBase/include/otbConvertPixelBuffer.h index cd90e2897f..371e34f1ed 100644 --- a/Modules/Core/ImageBase/include/otbConvertPixelBuffer.h +++ b/Modules/Core/ImageBase/include/otbConvertPixelBuffer.h @@ -66,7 +66,7 @@ public: OutputPixelType* outputData , size_t size); protected: - /** Convertions related to complex */ + /** Conversions related to complex */ static void ConvertGrayToComplex(InputPixelType * inputData, OutputPixelType * OutputData, size_t size); diff --git a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.txx b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.txx index ab78083eda..4b1cf715ae 100644 --- a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.txx +++ b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.txx @@ -61,14 +61,14 @@ KullbackLeiblerSupervizedDistance<TInput1, TInput2, TInputROIImage, TOutput> typedef itk::ConstNeighborhoodIterator< typename ROIConversionType1::OutputImageType> ROIInputType1; - typename ROIConversionType1::Pointer convertion1 = ROIConversionType1::New(); - convertion1->SetInputImage(img1); - convertion1->SetROIImage(imgROI); - convertion1->Update(); + typename ROIConversionType1::Pointer conversion1 = ROIConversionType1::New(); + conversion1->SetInputImage(img1); + conversion1->SetROIImage(imgROI); + conversion1->Update(); if (m_CumROI1 != NULL) delete m_CumROI1; - m_CumROI1 = new CumulantsForEdgeworth<ROIInputType1> (convertion1->GetOutput()); + m_CumROI1 = new CumulantsForEdgeworth<ROIInputType1> (conversion1->GetOutput()); if (!m_CumROI1->IsDataAvailable()) { @@ -84,14 +84,14 @@ KullbackLeiblerSupervizedDistance<TInput1, TInput2, TInputROIImage, TOutput> typedef itk::ConstNeighborhoodIterator< typename ROIConversionType2::OutputImageType> ROIInputType2; - typename ROIConversionType2::Pointer convertion2 = ROIConversionType2::New(); - convertion2->SetInputImage(img2); - convertion2->SetROIImage(imgROI); - convertion2->Update(); + typename ROIConversionType2::Pointer conversion2 = ROIConversionType2::New(); + conversion2->SetInputImage(img2); + conversion2->SetROIImage(imgROI); + conversion2->Update(); if (m_CumROI2 != NULL) delete m_CumROI2; - m_CumROI2 = new CumulantsForEdgeworth<ROIInputType2> (convertion2->GetOutput()); + m_CumROI2 = new CumulantsForEdgeworth<ROIInputType2> (conversion2->GetOutput()); if (!m_CumROI2->IsDataAvailable()) { diff --git a/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h index aa9b02c200..d77801a8dd 100644 --- a/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h +++ b/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h @@ -50,7 +50,7 @@ namespace otb * - Each change map is orthogonal to the others. * * This is a statistical method which can handle different modalities - * and even differents bands and number of bands between images. + * and even different bands and number of bands between images. * * If numbers of bands in image 1 and 2 are equal, then change maps * are sorted by increasing correlation. If number of bands is diff --git a/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.txx b/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.txx index 080a2308b5..9fc262fe14 100644 --- a/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.txx +++ b/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.txx @@ -325,7 +325,7 @@ VectorDataProjectionFilter<TInputVectorData, TOutputVectorData> } /** - * GenerateData Performs the coordinate convertion for each element in the tree + * GenerateData Performs the coordinate conversion for each element in the tree */ template <class TInputVectorData, class TOutputVectorData> void diff --git a/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.txx b/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.txx index 3f3bfca9f6..027d629345 100644 --- a/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.txx +++ b/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.txx @@ -132,7 +132,7 @@ VectorDataTransformFilter<TInputVectorData, TOutputVectorData> /** - * GenerateData Performs the coordinate convertion for each element in the tree + * GenerateData Performs the coordinate conversion for each element in the tree */ template <class TInputVectorData, class TOutputVectorData > void diff --git a/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.h b/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.h index 03b0824764..8b75827095 100644 --- a/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.h +++ b/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.h @@ -592,7 +592,7 @@ protected: virtual void AfterThreadedGenerateData(); - /** Allocates the outputs (need to be reimplemented since outputs have differents type) */ + /** Allocates the outputs (need to be reimplemented since outputs have different type) */ virtual void AllocateOutputs(); /** Constructor */ diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.txx b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.txx index 0e0aadaee6..71e607cd5f 100644 --- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.txx +++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.txx @@ -74,7 +74,7 @@ VectorDataToVectorDataFilter<TInputVectorData, TOutputVectorData> } /** - * GenerateData Performs the coordinate convertion for each element in the tree + * GenerateData Performs the coordinate conversion for each element in the tree */ template <class TInputVectorData, class TOutputVectorData> void diff --git a/Modules/IO/TestKernel/src/otbTestHelper.cxx b/Modules/IO/TestKernel/src/otbTestHelper.cxx index 36dd1eef71..a10623362f 100644 --- a/Modules/IO/TestKernel/src/otbTestHelper.cxx +++ b/Modules/IO/TestKernel/src/otbTestHelper.cxx @@ -545,7 +545,7 @@ int TestHelper::RegressionTestAsciiFile(const char * testAsciiFileName, const ch //FIXME won't be intuitive for the non order case unsigned int numLineDiff = std::min(listStrDiffLineFileRef.size(), listStrDiffLineFileTest.size()); - std::cout << "Nb lines differents : " << numLineDiff << std::endl; + std::cout << "Nb lines different : " << numLineDiff << std::endl; for (unsigned int i = 0; i < numLineDiff; ++i) { std::cout << " -------------------------------" << std::endl; diff --git a/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h index ce68b0f989..1cbbe1041e 100644 --- a/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h +++ b/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h @@ -46,7 +46,7 @@ namespace otb { * The user can set an OutputPixelType as a burn vector via * AddBurnValue(OutputImagePixelType burnValuesPix). To have a * different color for each VectorData, use this method with - * differents burnValuesPix as many times as VectorDatas set. + * different burnValuesPix as many times as VectorDatas set. * Again, the color will be duplicated if only one burnValuesPix * is set. * -- GitLab