This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository otb.
commit eff38a829d3be578b72381f1ed0ece3128df02bd Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Mon Dec 21 20:37:24 2015 +0100 Update spelling.patch to fix additional issues. --- debian/patches/cmake-fixes.patch | 2 +- debian/patches/itk-modules-list.patch | 2 - debian/patches/spelling.patch | 473 +++++++++++++++++++++++++++++++++- 3 files changed, 461 insertions(+), 16 deletions(-) diff --git a/debian/patches/cmake-fixes.patch b/debian/patches/cmake-fixes.patch index 0f0e1bb..1a4f68c 100644 --- a/debian/patches/cmake-fixes.patch +++ b/debian/patches/cmake-fixes.patch @@ -4,7 +4,7 @@ Last-Update: 2015-12-17 --- a/CMake/FindOssim.cmake +++ b/CMake/FindOssim.cmake -@@ -38,5 +38,5 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS( Ossim DEFAULT_MSG OSSIM_LIBRARY OSSIM_INCLUDE +@@ -38,5 +38,5 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS( Ossim mark_as_advanced( OSSIM_INCLUDE_DIR OSSIM_LIBRARY ) diff --git a/debian/patches/itk-modules-list.patch b/debian/patches/itk-modules-list.patch index becd3f7..e7f6a4d 100644 --- a/debian/patches/itk-modules-list.patch +++ b/debian/patches/itk-modules-list.patch @@ -1,6 +1,4 @@ ProxyChains-3.1 (http://proxychains.sf.net) -diff --git a/Modules/ThirdParty/ITK/CMakeLists.txt b/Modules/ThirdParty/ITK/CMakeLists.txt -index 55b0eb8..05c56fa 100644 --- a/Modules/ThirdParty/ITK/CMakeLists.txt +++ b/Modules/ThirdParty/ITK/CMakeLists.txt @@ -2,7 +2,91 @@ project(OTBITK) diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch index bb6a375..3ab8c86 100644 --- a/debian/patches/spelling.patch +++ b/debian/patches/spelling.patch @@ -4,9 +4,12 @@ Last-Update: 2015-09-01 --- a/Modules/Applications/AppChangeDetection/app/otbMultivariateAlterationDetector.cxx +++ b/Modules/Applications/AppChangeDetection/app/otbMultivariateAlterationDetector.cxx -@@ -75,7 +75,7 @@ private: +@@ -73,9 +73,9 @@ private: + " are sorted by increasing correlation. If number of bands is " + " different, the change maps are sorted by decreasing correlation. \n" " \n" - " The GetV1() and GetV2() methods allow to retrieve the linear " +- " The GetV1() and GetV2() methods allow to retrieve the linear " ++ " The GetV1() and GetV2() methods allow retrieving the linear " " combinations used to generate the Mad change maps as a vnl_matrix of " - " double, and the GetRho() method allows to retrieve the correlation " + " double, and the GetRho() method allows one to retrieve the correlation " @@ -86,6 +89,15 @@ Last-Update: 2015-09-01 "See complete documentation here \\url{http://docs.opencv.org/modules/ml/doc/decision_trees.html}."); //MaxDepth AddParameter(ParameterType_Int, "classifier.dt.max", "Maximum depth of the tree"); +@@ -51,7 +51,7 @@ void TrainImagesClassifier::InitDecision + + //UseSurrogates : don't need to be exposed ! + //AddParameter(ParameterType_Empty, "classifier.dt.sur", "Surrogate splits will be built"); +- //SetParameterDescription("classifier.dt.sur","These splits allow to work with missing data and compute variable importance correctly."); ++ //SetParameterDescription("classifier.dt.sur","These splits allow working with missing data and compute variable importance correctly."); + + //MaxCategories + AddParameter(ParameterType_Int, "classifier.dt.cat", --- a/Modules/Applications/AppClassification/app/otbTrainGradientBoostedTree.cxx +++ b/Modules/Applications/AppClassification/app/otbTrainGradientBoostedTree.cxx @@ -27,7 +27,7 @@ void TrainImagesClassifier::InitGradient @@ -97,17 +109,28 @@ Last-Update: 2015-09-01 "See complete documentation here \\url{http://docs.opencv.org/modules/ml/doc/gradient_boosted_trees.html}."); //LossFunctionType : not exposed, as only one type is used for Classification, // the other three are used for regression. +@@ -63,7 +63,7 @@ void TrainImagesClassifier::InitGradient + + //UseSurrogates : don't need to be exposed ! + //AddParameter(ParameterType_Empty, "classifier.gbt.sur", "Surrogate splits will be built"); +- //SetParameterDescription("classifier.gbt.sur","These splits allow to work with missing data and compute variable importance correctly."); ++ //SetParameterDescription("classifier.gbt.sur","These splits allow working with missing data and compute variable importance correctly."); + + } + --- a/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx +++ b/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx -@@ -35,7 +35,7 @@ void TrainImagesClassifier::DoInit() +@@ -35,8 +35,8 @@ void TrainImagesClassifier::DoInit() "Samples are composed of pixel values in each band optionally centered and reduced using an XML statistics file produced by " "the ComputeImagesStatistics application.\n The training vector data must contain polygons with a positive integer field " "representing the class label. The name of this field can be set using the \"Class label field\" parameter. Training and validation " - "sample lists are built such that each class is equally represented in both lists. One parameter allows to control the ratio " +- "between the number of samples in training and validation sets. Two parameters allow to manage the size of the training and " + "sample lists are built such that each class is equally represented in both lists. One parameter allows one to control the ratio " - "between the number of samples in training and validation sets. Two parameters allow to manage the size of the training and " ++ "between the number of samples in training and validation sets. Two parameters allow managing the size of the training and " "validation sets per class and per image.\n Several classifier parameters can be set depending on the chosen classifier. In the " "validation process, the confusion matrix is organized the following way: rows = reference labels, columns = produced labels. " + "In the header of the optional confusion matrix output file, the validation (reference) and predicted (produced) class labels" @@ -50,7 +50,7 @@ void TrainImagesClassifier::DoInit() //Group IO @@ -179,6 +202,15 @@ Last-Update: 2015-09-01 "See complete documentation here \\url{http://docs.opencv.org/modules/ml/doc/random_trees.html}."); //MaxDepth AddParameter(ParameterType_Int, "classifier.rf.max", "Maximum depth of the tree"); +@@ -52,7 +52,7 @@ void TrainImagesClassifier::InitRandomFo + + //UseSurrogates : don't need to be exposed ! + //AddParameter(ParameterType_Empty, "classifier.rf.sur", "Surrogate splits will be built"); +- //SetParameterDescription("classifier.rf.sur","These splits allow to work with missing data and compute variable importance correctly."); ++ //SetParameterDescription("classifier.rf.sur","These splits allow working with missing data and compute variable importance correctly."); + + //MaxNumberOfCategories + AddParameter(ParameterType_Int, "classifier.rf.cat", --- a/Modules/Applications/AppClassification/app/otbTrainSVM.cxx +++ b/Modules/Applications/AppClassification/app/otbTrainSVM.cxx @@ -26,7 +26,7 @@ namespace Wrapper @@ -1034,15 +1066,18 @@ Last-Update: 2015-09-01 AddChoice("mode.raster", "Standard segmentation with labeled raster output"); SetParameterDescription("mode.raster","In this mode, the application will output a standard labeled raster. This mode can not handle large data."); -@@ -257,7 +257,7 @@ private: +@@ -257,9 +257,9 @@ private: SetParameterDescription("mode.vector.out", "The output vector file or database (name can be anything understood by OGR)"); AddParameter(ParameterType_Choice,"mode.vector.outmode","Writing mode for the output vector file"); - SetParameterDescription("mode.vector.outmode","This allows to set the writing behaviour for the output vector file. Please note that the actual behaviour depends on the file format."); + SetParameterDescription("mode.vector.outmode","This allows one to set the writing behaviour for the output vector file. Please note that the actual behaviour depends on the file format."); - AddChoice("mode.vector.outmode.ulco","Update output vector file, only allow to create new layers"); +- AddChoice("mode.vector.outmode.ulco","Update output vector file, only allow to create new layers"); ++ AddChoice("mode.vector.outmode.ulco","Update output vector file, only allow creating new layers"); SetParameterDescription("mode.vector.outmode.ulco","The output vector file is opened in update mode if existing. If the output layer already exists, the application stops, leaving it untouched."); + + AddChoice("mode.vector.outmode.ovw","Overwrite output vector file if existing."); @@ -297,7 +297,7 @@ private: AddParameter(ParameterType_Float, "mode.vector.simplify", "Simplify polygons"); @@ -1078,7 +1113,7 @@ Last-Update: 2015-09-01 AddParameter(ParameterType_InputImage,"io.inleft","Left input image"); SetParameterDescription("io.inleft","The left input image (reference)"); -@@ -162,24 +162,24 @@ private: +@@ -162,30 +162,30 @@ private: SetParameterDescription("io.outmetric","If used, the output image will have a second component with metric optimal values"); AddParameter(ParameterType_Group,"mask","Image masking parameters"); @@ -1108,6 +1143,13 @@ Last-Update: 2015-09-01 MandatoryOff("mask.variancet"); SetDefaultParameterFloat("mask.variancet",100.); DisableParameter("mask.variancet"); + + AddParameter(ParameterType_Group,"bm","Block matching parameters"); +- SetParameterDescription("bm","This group of parameters allow to tune the block-matching behaviour"); ++ SetParameterDescription("bm","This group of parameters allow tuning the block-matching behaviour"); + + AddParameter(ParameterType_Choice, "bm.metric", "Block-matching metric"); + AddChoice("bm.metric.ssd","Sum of Squared Distances"); --- a/Modules/Applications/AppStereo/app/otbDisparityMapToElevationMap.cxx +++ b/Modules/Applications/AppStereo/app/otbDisparityMapToElevationMap.cxx @@ -76,7 +76,7 @@ private: @@ -1157,7 +1199,7 @@ Last-Update: 2015-09-01 AddParameter(ParameterType_Int,"stereorect.fwdgridstep","Step of the displacement grid (in pixels)"); SetParameterDescription("stereorect.fwdgridstep","Stereo-rectification displacement grid only varies slowly. Therefore, it is recommended to use a coarser grid (higher step value) in case of large images"); -@@ -425,7 +425,7 @@ private: +@@ -425,13 +425,13 @@ private: MandatoryOff("stereorect.fwdgridstep"); AddParameter(ParameterType_Int, "stereorect.invgridssrate", "Sub-sampling rate for epipolar grid inversion"); @@ -1166,6 +1208,13 @@ Last-Update: 2015-09-01 SetDefaultParameterInt("stereorect.invgridssrate",10); SetMinimumParameterIntValue("stereorect.invgridssrate",1); MandatoryOff("stereorect.invgridssrate"); + + AddParameter(ParameterType_Group,"bm","Block matching parameters"); +- SetParameterDescription("bm","This group of parameters allow to tune the block-matching behavior"); ++ SetParameterDescription("bm","This group of parameters allow tuning the block-matching behavior"); + + AddParameter(ParameterType_Choice, "bm.metric", "Block-matching metric"); + //SetDefaultParameterInt("bm.metric",3); @@ -504,7 +504,7 @@ private: DisableParameter("mask.right"); @@ -1488,6 +1537,15 @@ Last-Update: 2015-09-01 // Doc example parameter settings SetDocExampleParameterValue("psin", "cdbTvComputePolylineFeatureFromImage_LI_NOBUIL_gt.shp"); +@@ -406,7 +406,7 @@ private: + { + // An error has occurred in the optimization. + // Update the parameters +- otbAppLogFATAL("ERROR: Exception Catched!" << std::endl); ++ otbAppLogFATAL("ERROR: Exception Caught!" << std::endl); + otbAppLogFATAL(<< err.GetDescription() << std::endl); + const unsigned int numberOfIterations = m_Optimizer->GetOptimizer()->get_num_evaluations(); + otbAppLogFATAL("numberOfIterations : " << numberOfIterations << std::endl); --- a/Modules/Applications/AppFusion/app/otbBundleToPerfectSensor.cxx +++ b/Modules/Applications/AppFusion/app/otbBundleToPerfectSensor.cxx @@ -154,7 +154,7 @@ private: @@ -2334,6 +2392,20 @@ Last-Update: 2015-09-01 * height above Mean Sea Level (MSL). * * Here is the complete description of both methods output depending +@@ -140,11 +140,11 @@ protected: + + ossimElevManager* m_ElevManager; + +- // Ossim does not allow to retrieve the geoid file path ++ // Ossim does not allow retrieving the geoid file path + // We therefore must keep it on our side + std::string m_GeoidFile; + +- // Ossim does not allow to retrieve the default height above ++ // Ossim does not allow retrieving the default height above + // ellipsoid We therefore must keep it on our side + double m_DefaultHeightAboveEllipsoid; + --- a/Modules/Core/Common/include/otbModelComponentBase.txx +++ b/Modules/Core/Common/include/otbModelComponentBase.txx @@ -187,7 +187,7 @@ ModelComponentBase<TSample> @@ -2602,9 +2674,12 @@ Last-Update: 2015-09-01 * --- a/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h +++ b/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h -@@ -58,7 +58,7 @@ namespace otb +@@ -56,9 +56,9 @@ namespace otb + * are sorted by increasing correlation. If number of bands is + * different, the change maps are sorted by decreasing correlation. * - * The GetV1() and GetV2() methods allow to retrieve the linear +- * The GetV1() and GetV2() methods allow to retrieve the linear ++ * The GetV1() and GetV2() methods allow retrieving the linear * combinations used to generate the Mad change maps as a vnl_matrix of - * double, and the GetRho() method allows to retrieve the correlation + * double, and the GetRho() method allows retrieving the correlation @@ -2888,7 +2963,7 @@ Last-Update: 2015-09-01 --- a/Modules/Learning/DempsterShafer/include/otbMassOfBelief.h +++ b/Modules/Learning/DempsterShafer/include/otbMassOfBelief.h -@@ -57,20 +57,20 @@ namespace otb +@@ -57,26 +57,26 @@ namespace otb * retrieved using the GetMass method. If no mass has been associated * with this element, null is returned. * @@ -2915,6 +2990,13 @@ Last-Update: 2015-09-01 * two mass functions will share the exact same universe and * power-set, but is not mandatory, since mass is supposed to be null * for any set if not stated otherwise. + * + * Once masses are set, the GetPlausibility() and GetBelief() +- * function allow to compute the belief and plausibility for an ++ * function allow computing the belief and plausibility for an + * element of the power-set, or directly for a set of elements of the + * power-set intersecting (resp. contained in) a given hypothesis. + * --- a/Modules/Learning/SVMLearning/include/otbSVMCrossValidationCostFunction.h +++ b/Modules/Learning/SVMLearning/include/otbSVMCrossValidationCostFunction.h @@ -27,7 +27,7 @@ namespace otb @@ -2950,6 +3032,15 @@ Last-Update: 2015-09-01 * --- a/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.h +++ b/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.h +@@ -36,7 +36,7 @@ namespace otb + * is defined by SetSearchRadius() method. + * + * To do so, it optimizes a metric set using the SetMetric() method, which accepts any itk metric +- * deriving from the itk::ImageToImageMetric. The MinimizeOn()/MinimizeOff() flag allow to search for ++ * deriving from the itk::ImageToImageMetric. The MinimizeOn()/MinimizeOff() flag allows searching for + * minimum or maximum depending on the metric (default is On). + * + * Once a coarse (pixel wise) offset has been found, this match is further refined using dichotomic search @@ -58,7 +58,7 @@ namespace otb * grid step to value higher than 1 (grid step is expressed in terms of number of fixed image pixels). * Default value is 1. @@ -3033,6 +3124,15 @@ Last-Update: 2015-09-01 * resampling grid. Please keep in mind that the whole grid is loaded * into memory, and that the epipolar lines direction may only vary * smoothly. When working with large images, a coarse grid-step will +@@ -107,7 +107,7 @@ public: + typedef typename OutputImageType::RegionType RegionType; + + // 3D RS transform +- // TODO: Allow to tune precision (i.e. double or float) ++ // TODO: Allow tuning precision (i.e. double or float) + typedef otb::GenericRSTransform<double,3,3> RSTransformType; + typedef typename RSTransformType::Pointer RSTransformPointerType; + --- a/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h +++ b/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h @@ -39,7 +39,7 @@ namespace otb @@ -3044,6 +3144,15 @@ Last-Update: 2015-09-01 * and their pixel coordinates. * The input image is used to transform pixel coordinates of the streaming lines into * coordinate system of the image, which must be the same as the one in the OGR input file. +@@ -134,7 +134,7 @@ protected: + void ProcessStreamingLine(bool line, itk::ProgressReporter &progress); + /** get length in case of OGRGeometryCollection. + * This function recodes the get_lenght method available since gdal 1.8.0 +- * in the case of OGRGeometryCollection. The aim is allow to access polygon stiching ++ * in the case of OGRGeometryCollection. The aim is allow accessing polygon stiching + * functionalities with gdal 1.6. + */ + double GetLengthOGRGeometryCollection(OGRGeometryCollection * intersection); --- a/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h +++ b/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h @@ -29,7 +29,7 @@ namespace otb { @@ -3105,15 +3214,18 @@ Last-Update: 2015-09-01 app->AddParameter(ParameterType_Int, oss.str(), "EPSG Code"); --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt -@@ -27,7 +27,7 @@ OTB-v.5.0.0 - Changes since version 4.4. +@@ -27,9 +27,9 @@ OTB-v.5.0.0 - Changes since version 4.4. * Superbuild * A separate superbuild project has been added in the Superbuild repository - * It allows to build all OTB dependencies from source, and then OTB (thus replaces the removed internal versions) + * It allows building all OTB dependencies from source, and then OTB (thus replaces the removed internal versions) * Sources are checked out at configuration time or can be downloaded beforehand - * Allow to build a complete OTB with a handful of prerequisites (gcc, cmake, curl) +- * Allow to build a complete OTB with a handful of prerequisites (gcc, cmake, curl) ++ * Allow building a complete OTB with a handful of prerequisites (gcc, cmake, curl) + * Doxygen + * Classes are now organized by modules @@ -77,7 +77,7 @@ OTB-v.5.0.0 - Changes since version 4.4. * 0001037: file and vector outputs need explicit relative paths * 0001036: TileFusion application crashes with SPOT-7 tiled images @@ -3209,6 +3321,15 @@ Last-Update: 2015-09-01 --- a/Utilities/Doxygen/OTB/Registration.dox +++ b/Utilities/Doxygen/OTB/Registration.dox +@@ -10,7 +10,7 @@ particular transformation. + A typical example of registration is to have two medical images + from the same patient taken at different dates. It is very likely + that the patient assume a different position during each acquisition. +-A registration procedure would allow to take both images and find ++A registration procedure would allow taking both images and find + a spatial transformation to find the corresponding pixel from one + image into the other. + @@ -75,7 +75,7 @@ Unfortunately there are no clear rules a Metrics are depend on the objects they compare. The toolkit currently offers <em> Image To Image </em> and <em> PointSet to Image </em> metrics as follows: @@ -3641,3 +3762,329 @@ Last-Update: 2015-09-01 { m_StringLayout = new QVBoxLayout(); m_StringLayout->setSpacing(0); +--- a/Copyright/ITKCopyright.txt ++++ b/Copyright/ITKCopyright.txt +@@ -17,7 +17,7 @@ of Health. ITK is partially derived from + copyrighted accordingly (see VTKCopyright.txt and VXLCopyright.txt). + + The copyright of most of the files in the "Utilities" subdirectory is held by +-third parties who allow to distribute this material under a license compatible ++third parties who allow distributing this material under a license compatible + with the one used by ITK. Please read the content of the subdirectories for + specific details on those third-party licenses. You will also find details in + the README.txt file under the "Copyright" subdirectory. +--- a/Examples/DataRepresentation/Image/ImageListExample.cxx ++++ b/Examples/DataRepresentation/Image/ImageListExample.cxx +@@ -135,8 +135,8 @@ int main(int itkNotUsed(argc), char * ar + // + // Other useful methods are: + // \begin{itemize} +-// \item \code{SetNthElement()} and \code{GetNthElement()} allow to +-// randomly access any element of the list. ++// \item \code{SetNthElement()} and \code{GetNthElement()} allow ++// randomly accessing any element of the list. + // \item \code{Front()} to access to the first element of the list. + // \item \code{Erase()} to remove an element. + // \end{itemize} +--- a/Examples/FeatureExtraction/AssymmetricFusionOfLineDetectorExample.cxx ++++ b/Examples/FeatureExtraction/AssymmetricFusionOfLineDetectorExample.cxx +@@ -180,7 +180,7 @@ int main(int argc, char * argv[]) + // Software Guide : BeginLatex + // + // The methods \code{SetLengthLine()} and \code{SetWidthLine()} +- // allow to set the minimum length and the typical witdh of the ++ // allow setting the minimum length and the typical witdh of the + // lines which are to be detected. + // + // \index{otb::AssymetricFusionOfDetector!SetWidthLine()} +--- a/Examples/FeatureExtraction/CorrelationLineDetectorExample.cxx ++++ b/Examples/FeatureExtraction/CorrelationLineDetectorExample.cxx +@@ -185,7 +185,7 @@ int main(int argc, char * argv[]) + // Software Guide : BeginLatex + // + // The methods \code{SetLengthLine()} and \code{SetWidthLine()} +- // allow to set the minimum length and the typical witdh of the ++ // allow setting the minimum length and the typical witdh of the + // lines which are to be detected. + // + // \index{otb::LineCorrelationDetector!SetWidthLine()} +--- a/Examples/FeatureExtraction/ExtractSegmentsByStepsExample.cxx ++++ b/Examples/FeatureExtraction/ExtractSegmentsByStepsExample.cxx +@@ -194,7 +194,7 @@ int main(int argc, char * argv[]) + // Software Guide : BeginLatex + // + // The methods \code{SetLengthLine()} and \code{SetWidthLine()} +- // allow to set the minimum length and the typical witdh of the ++ // allow setting the minimum length and the typical witdh of the + // lines which are to be detected. + // + // +--- a/Examples/FeatureExtraction/ExtractSegmentsExample.cxx ++++ b/Examples/FeatureExtraction/ExtractSegmentsExample.cxx +@@ -191,7 +191,7 @@ int main(int argc, char * argv[]) + // Software Guide : BeginLatex + // + // The methods \code{SetLengthLine()} and \code{SetWidthLine()} +- // allow to set the minimum length and the typical witdh of the ++ // allow setting the minimum length and the typical witdh of the + // lines which are to be detected. + // + // +--- a/Examples/FeatureExtraction/RatioLineDetectorExample.cxx ++++ b/Examples/FeatureExtraction/RatioLineDetectorExample.cxx +@@ -184,7 +184,7 @@ int main(int argc, char * argv[]) + // Software Guide : BeginLatex + // + // The methods \code{SetLengthLine()} and \code{SetWidthLine()} +- // allow to set the minimum length and the typical witdh of the ++ // allow setting the minimum length and the typical witdh of the + // lines which are to be detected. + // + // \index{otb::LineRatioDetector!SetWidthLine()} +--- a/Examples/Segmentation/VectorConfidenceConnected.cxx ++++ b/Examples/Segmentation/VectorConfidenceConnected.cxx +@@ -294,7 +294,7 @@ int main( int argc, char *argv[] ) + // The coloration of muscular tissue makes it easy to distinguish them from + // the surrounding anatomical structures. The optic vitrea on the other hand + // has a coloration that is not very homogeneous inside the eyeball and +- // does not allow to generate a full segmentation based only on color. ++ // does not allow generating a full segmentation based only on color. + // + // Software Guide : EndLatex + +--- a/Examples/Tutorials/Multispectral.cxx ++++ b/Examples/Tutorials/Multispectral.cxx +@@ -91,7 +91,7 @@ int main(int argc, char * argv[]) + // Software Guide : BeginLatex + // + // We need to pass the parameters to the filter for the extraction. This +- // filter also allow to extract only a spatial subset of the image. However, ++ // filter also allows extracting only a spatial subset of the image. However, + // we will extract the whole channel in this case. + // + // To do that, we need to pass the desired region using the +--- a/Modules/Adapters/OSSIMAdapters/src/otbDEMHandler.cxx ++++ b/Modules/Adapters/OSSIMAdapters/src/otbDEMHandler.cxx +@@ -122,7 +122,7 @@ DEMHandler + ossimRefPtr<ossimGeoid> geoidPtr = new ossimGeoidEgm96(geoid); + if (geoidPtr->getErrorStatus() == ossimErrorCodes::OSSIM_OK) + { +- // Ossim does not allow to retrieve the geoid file path ++ // Ossim does not allow retrieving the geoid file path + // We therefore must keep it on our side + m_GeoidFile = geoidFile; + otbMsgDevMacro(<< "Geoid successfully opened"); +@@ -192,7 +192,7 @@ void + DEMHandler + ::SetDefaultHeightAboveEllipsoid(double h) + { +- // Ossim does not allow to retrieve the default height above ++ // Ossim does not allow retrieving the default height above + // ellipsoid We therefore must keep it on our side + m_DefaultHeightAboveEllipsoid = h; + m_ElevManager->setDefaultHeightAboveEllipsoid(h); +@@ -202,7 +202,7 @@ double + DEMHandler + ::GetDefaultHeightAboveEllipsoid() const + { +- // Ossim does not allow to retrieve the default height above ++ // Ossim does not allow retrieving the default height above + // ellipsoid We therefore must keep it on our side + return m_DefaultHeightAboveEllipsoid; + } +@@ -220,7 +220,7 @@ std::string DEMHandler::GetDEMDirectory( + + std::string DEMHandler::GetGeoidFile() const + { +- // Ossim does not allow to retrieve the geoid file path ++ // Ossim does not allow retrieving the geoid file path + // We therefore must keep it on our side + return m_GeoidFile; + } +--- a/Modules/Core/ImageBase/include/otbImage.h ++++ b/Modules/Core/ImageBase/include/otbImage.h +@@ -59,7 +59,7 @@ public: + typedef typename Superclass::ValueType ValueType; + + /** Internal Pixel representation. Used to maintain a uniform API +- * with Image Adaptors and allow to keep a particular internal ++ * with Image Adaptors and allow keeping a particular internal + * representation of data while showing a different external + * representation. */ + typedef typename Superclass::InternalPixelType InternalPixelType; +--- a/Modules/Core/ImageBase/include/otbRemoteSensingRegion.h ++++ b/Modules/Core/ImageBase/include/otbRemoteSensingRegion.h +@@ -116,7 +116,7 @@ public: + } + + /** This method provides explicit conversion to itk::ImageRegion<2>, +- * so as to allow to use RemoteSensingRegion to specify requested ++ * so as to allow using RemoteSensingRegion to specify requested + * region for images or images iterators. + */ + const ImageRegionType GetImageRegion() +--- a/Modules/Core/ImageBase/include/otbVectorImage.h ++++ b/Modules/Core/ImageBase/include/otbVectorImage.h +@@ -59,7 +59,7 @@ public: + typedef typename Superclass::ValueType ValueType; + + /** Internal Pixel representation. Used to maintain a uniform API +- * with Image Adaptors and allow to keep a particular internal ++ * with Image Adaptors and allow keeping a particular internal + * representation of data while showing a different external + * representation. */ + typedef typename Superclass::InternalPixelType InternalPixelType; +--- a/Modules/Core/Metadata/src/otbPleiadesImageMetadataInterface.cxx ++++ b/Modules/Core/Metadata/src/otbPleiadesImageMetadataInterface.cxx +@@ -731,7 +731,7 @@ PleiadesImageMetadataInterface::GetSatAz + } + else + { +- //Got orientation and incidences angle which allow to compute satellite ++ //Got orientation and incidences angle which allow computing satellite + // azimuthal angle + + // MSD: for the moment take only topCenter value +--- a/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h ++++ b/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h +@@ -32,7 +32,7 @@ namespace otb { + * when projecting an image in a target SRS. The user can set the + * target projectionRef via SetOutputProjectionRef(std::string). + * +- * This class allow to force using a desired spacing. For ++ * This class allow forcing using a desired spacing. For + * instance, if one need to compute the output Size of an + * image in the UTM srs with a spacing of 5 m, it can be set via the + * method ForceSpacingTo(spacing). +--- a/Modules/IO/ImageIO/include/otbImageFileReader.h ++++ b/Modules/IO/ImageIO/include/otbImageFileReader.h +@@ -66,7 +66,7 @@ public: + * It interfaces with an ImageIO class to read in the data and + * supports streaming (partial reading) if the source dataset does so. + * +- * ImageFileReader supports extended filenames, which allow to control ++ * ImageFileReader supports extended filenames, which allow controling + * how the source dataset is read. See + * http://wiki.orfeo-toolbox.org/index.php/ExtendedFileName for more + * information. +--- a/Modules/IO/ImageIO/include/otbImageFileWriter.h ++++ b/Modules/IO/ImageIO/include/otbImageFileWriter.h +@@ -43,7 +43,7 @@ namespace otb + * ImageFileWriter will write directly the streaming buffer in the image file, so + * that the output image never needs to be completely allocated + * +- * ImageFileWriter supports extended filenames, which allow to control ++ * ImageFileWriter supports extended filenames, which allow controling + * some properties of the output file. See + * http://wiki.orfeo-toolbox.org/index.php/ExtendedFileName for more + * information. +--- a/Modules/Learning/SOM/include/otbPeriodicSOM.txx ++++ b/Modules/Learning/SOM/include/otbPeriodicSOM.txx +@@ -58,7 +58,7 @@ PeriodicSOM<TListSample, TMap, TSOMLearn + NeighborhoodIteratorType it(radius, map, mapRegion); + + // Here, the periodic update is achieved 'by hand' since +- // PeriodicBoundaryCondition does not allow to modifiy ++ // PeriodicBoundaryCondition does not allow modifying + // VectorImage contents + SizeType mapSize = mapRegion.GetSize(); + IndexType positionToUpdate; +--- a/Modules/Learning/SOM/include/otbSOMWithMissingValue.txx ++++ b/Modules/Learning/SOM/include/otbSOMWithMissingValue.txx +@@ -70,7 +70,7 @@ SOMWithMissingValue<TListSample, TMap, T + NeighborhoodIteratorType it(radius, map, mapRegion); + + // Here, the periodic update is achieved 'by hand' since +- // PeriodicBoundaryCondition does not allow to modifiy ++ // PeriodicBoundaryCondition does not allow modifying + // VectorImage contents + SizeType mapSize = mapRegion.GetSize(); + IndexType positionToUpdate; +--- a/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.h ++++ b/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.h +@@ -83,7 +83,7 @@ public: + itkSetMacro(RegressionAccuracy, double); + + /** If true then surrogate splits will be built. +- * These splits allow to work with missing data and compute variable importance correctly. ++ * These splits allow working with missing data and compute variable importance correctly. + * Default is true + * \see http://docs.opencv.org/modules/ml/doc/decision_trees.html#CvDTreeParams::CvDTreeParams%28%29 + */ +--- a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.h ++++ b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.h +@@ -95,7 +95,7 @@ public: + itkSetMacro(MaxDepth, int); + + /** If true then surrogate splits will be built. +- * These splits allow to work with missing data and compute variable importance correctly. ++ * These splits allow working with missing data and compute variable importance correctly. + * Default is false + * \see http://docs.opencv.org/modules/ml/doc/gradient_boosted_trees.html#cvgbtreesparams-cvgbtreesparams + */ +--- a/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.h ++++ b/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.h +@@ -74,7 +74,7 @@ public: + typedef typename OutputImageType::PixelType DEMPixelType; + + // 3D RS transform +- // TODO: Allow to tune precision (i.e. double or float) ++ // TODO: Allow tuning precision (i.e. double or float) + typedef double PrecisionType; + typedef otb::GenericRSTransform<PrecisionType,3,3> RSTransformType; + +--- a/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.h ++++ b/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.h +@@ -88,7 +88,7 @@ public: + typedef itk::ImageRegionSplitter<2> SplitterType; + + // 3D RS transform +- // TODO: Allow to tune precision (i.e. double or float) ++ // TODO: Allow tuning precision (i.e. double or float) + typedef otb::GenericRSTransform<double,3,3> RSTransformType; + //typedef typename RSTransformType::Pointer RSTransformPointerType; + +--- a/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h ++++ b/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h +@@ -81,7 +81,7 @@ public: + typedef typename OutputImageType::PixelType DEMPixelType; + + // 3D RS transform +- // TODO: Allow to tune precision (i.e. double or float) ++ // TODO: Allow tuning precision (i.e. double or float) + typedef double PrecisionType; + typedef otb::GenericRSTransform + <PrecisionType,3,3> RSTransformType; +--- a/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h ++++ b/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h +@@ -111,7 +111,7 @@ public: + typedef typename InputMapType::PixelType MapPixelType; + typedef typename InputMapType::InternalPixelType InputInternalPixelType; + // 3D RS transform +- // TODO: Allow to tune precision (i.e. double or float) ++ // TODO: Allow tuning precision (i.e. double or float) + typedef double PrecisionType; + typedef otb::GenericRSTransform + <PrecisionType,3,3> RSTransformType; +--- a/Utilities/Doxygen/OTB/Iterators.dox ++++ b/Utilities/Doxygen/OTB/Iterators.dox +@@ -106,7 +106,7 @@ + the image. The user can be sure though, that all the pixels inside the region + will be visited. + +- The following iterators allow to walk the image in specific directions ++ The following iterators allow walking the image in specific directions + + - itk::ImageLinearIteratorWithIndex Along lines + - itk::ImageSliceIteratorWithIndex Along lines, then along planes +--- a/Utilities/Doxygen/OTB/Modules.dox ++++ b/Utilities/Doxygen/OTB/Modules.dox +@@ -99,7 +99,7 @@ + \defgroup Iterators Iterators + \ingroup DataAccess + Iterators are the mechanism used to walk over the content of a particular data object. +-They allow to define paths and directions along which the data should be walked through. ++They allow defining paths and directions along which the data should be walked through. + */ + + /** -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel