[otb] 01/01: update for patches in ossim #2

Rashad Kanavath rashad-guest at moszumanska.debian.org
Wed Dec 23 12:23:29 UTC 2015


This is an automated email from the git hooks/post-receive script.

rashad-guest pushed a commit to branch master
in repository otb.

commit 411e480da40610cb16d51d1e345415ca1ff56f3d
Author: Rashad Kanavath <rashad.kanavath at c-s.fr>
Date:   Wed Dec 23 13:23:07 2015 +0100

    update for patches in ossim #2
---
 debian/patches/itk-modules-list.patch |  12 +-
 debian/patches/spelling.patch         | 550 +++++++++++++++++-----------------
 2 files changed, 280 insertions(+), 282 deletions(-)

diff --git a/debian/patches/itk-modules-list.patch b/debian/patches/itk-modules-list.patch
index 6abdc37..dc76c17 100644
--- a/debian/patches/itk-modules-list.patch
+++ b/debian/patches/itk-modules-list.patch
@@ -2,12 +2,10 @@ Description: Fix find_package(ITK) with only required COMPONENTS list
 Author: Rashad Kanavath <rashad.kanavath at c-s.fr>
 Last-Update: 2015-12-22
 
-diff --git a/Modules/ThirdParty/ITK/CMakeLists.txt b/Modules/ThirdParty/ITK/CMakeLists.txt
-index 55b0eb8..8b41866 100644
---- a/Modules/ThirdParty/ITK/CMakeLists.txt
-+++ b/Modules/ThirdParty/ITK/CMakeLists.txt
-@@ -2,7 +2,80 @@ project(OTBITK)
-
+--- otb.orig/Modules/ThirdParty/ITK/CMakeLists.txt
++++ otb/Modules/ThirdParty/ITK/CMakeLists.txt
+@@ -2,7 +2,80 @@
+ 
  set(OTBITK_SYSTEM_INCLUDE_DIRS ${ITK_INCLUDE_DIRS})
  set(OTBITK_LIBRARIES "${ITK_LIBRARIES}")
 -set(OTBITK_EXPORT_CODE_BUILD "find_package(ITK REQUIRED HINTS ${ITK_DIR})")
@@ -86,5 +84,5 @@ index 55b0eb8..8b41866 100644
 +set(OTBITK_EXPORT_CODE_BUILD "find_package(ITK REQUIRED COMPONENTS ${OTBITK_ITK_REQUIRED_MODULE_LIST} HINTS ${ITK_DIR})")
 +
  set(OTBITK_EXPORT_CODE_INSTALL ${OTBITK_EXPORT_CODE_BUILD})
-
+ 
  otb_module_impl()
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
index 47a4fb1..b110869 100644
--- a/debian/patches/spelling.patch
+++ b/debian/patches/spelling.patch
@@ -18,21 +18,21 @@ Last-Update: 2015-12-22
 --- otb.orig/Modules/Applications/AppClassification/app/otbClassificationMapRegularization.cxx
 +++ otb/Modules/Applications/AppClassification/app/otbClassificationMapRegularization.cxx
 @@ -71,7 +71,7 @@
-
+ 
      /** GROUP IO CLASSIFICATION */
      AddParameter(ParameterType_Group,"io","Input and output images");
 -    SetParameterDescription("io","This group of parameters allows to set input and output images for classification map regularization by Majority Voting.");
 +    SetParameterDescription("io","This group of parameters allows one to set input and output images for classification map regularization by Majority Voting.");
-
+ 
      AddParameter(ParameterType_InputImage, "io.in",  "Input classification image");
      SetParameterDescription( "io.in", "The input labeled image to regularize.");
 @@ -82,7 +82,7 @@
-
-
+ 
+ 
      AddParameter(ParameterType_Group,"ip","Regularization parameters");
 -    SetParameterDescription("ip","This group allows to set parameters for classification map regularization by Majority Voting.");
 +    SetParameterDescription("ip","This group allows one to set parameters for classification map regularization by Majority Voting.");
-
+ 
      AddParameter(ParameterType_Int, "ip.radius", "Structuring element radius (in pixels)");
      SetParameterDescription("ip.radius", "The radius of the ball shaped structuring element (expressed in pixels). By default, 'ip.radius = 1 pixel'.");
 --- otb.orig/Modules/Applications/AppClassification/app/otbFusionOfClassifications.cxx
@@ -48,7 +48,7 @@ Last-Update: 2015-12-22
          "-DEMPSTER SHAFER: for each pixel, the class label for which the Belief Function is maximal is selected. This Belief Function is calculated "
 @@ -346,7 +346,7 @@
          std::vector<std::string> confusionMatricesFilenameList = GetParameterStringList("method.dempstershafer.cmfl");
-
+ 
          MassOfBeliefDefinitionMethod massOfBeliefDefMethod;
 -        //setting default to supress warning
 +        //setting default to suppress warning
@@ -59,12 +59,12 @@ Last-Update: 2015-12-22
 +++ otb/Modules/Applications/AppClassification/app/otbImageClassifier.cxx
 @@ -81,7 +81,7 @@
      SetParameterDescription( "in", "The input image to classify.");
-
+ 
      AddParameter(ParameterType_InputImage,  "mask",   "Input Mask");
 -    SetParameterDescription( "mask", "The mask allows to restrict classification of the input image to the area where mask pixel values are greater than 0.");
 +    SetParameterDescription( "mask", "The mask allows one to restrict classification of the input image to the area where mask pixel values are greater than 0.");
      MandatoryOff("mask");
-
+ 
      AddParameter(ParameterType_InputFilename, "model", "Model file");
 --- otb.orig/Modules/Applications/AppDescriptors/app/otbHomologousPointsExtraction.cxx
 +++ otb/Modules/Applications/AppDescriptors/app/otbHomologousPointsExtraction.cxx
@@ -94,17 +94,17 @@ Last-Update: 2015-12-22
        " This is done via reprojection or by applying the image sensor models.");
 @@ -175,7 +175,7 @@
      SetDefaultParameterFloat("precision",0.);
-
+ 
      AddParameter(ParameterType_Empty,"mfilter","Filter points according to geographical or sensor based colocalisation");
 -    SetParameterDescription("mfilter","If enabled, this option allows to filter matches according to colocalisation from sensor or geographical information, using the given tolerancy expressed in pixels");
 +    SetParameterDescription("mfilter","If enabled, this option allows one to filter matches according to colocalisation from sensor or geographical information, using the given tolerancy expressed in pixels");
-
+ 
      AddParameter(ParameterType_Empty,"2wgs84","If enabled, points from second image will be exported in WGS84");
-
+ 
 --- otb.orig/Modules/Applications/AppEdge/app/otbLineSegmentDetection.cxx
 +++ otb/Modules/Applications/AppEdge/app/otbLineSegmentDetection.cxx
 @@ -57,7 +57,7 @@
-
+ 
      // Documentation
      SetDocName("Line segment detection");
 -    SetDocLongDescription("This application detects locally straight contours in a image. It is based on Burns, Hanson, and Riseman method and use an a contrario validation approach (Desolneux, Moisan, and Morel). The algorithm was published by Rafael Gromponevon Gioi, Jérémie Jakubowicz, Jean-Michel Morel and Gregory Randall.\n The given approach computes gradient and level lines of the image and detects aligned points in line support region. The application allows to export the detect [...]
@@ -115,7 +115,7 @@ Last-Update: 2015-12-22
 --- otb.orig/Modules/Applications/AppHyperspectral/app/otbHyperspectralUnmixing.cxx
 +++ otb/Modules/Applications/AppHyperspectral/app/otbHyperspectralUnmixing.cxx
 @@ -96,7 +96,7 @@
-
+ 
      // Documentation
      SetDocName("Hyperspectral data unmixing");
 -    SetDocLongDescription("The application applies a linear unmixing algorithm to an hyperspectral data cube. This method supposes that the mixture between materials in the scene is macroscopic and simulates a linear mixing model of spectra.\nThe Linear Mixing Model (LMM) acknowledges that reflectance spectrum associated with each pixel is a linear combination of pure materials in the recovery area, commonly known as endmembers. Endmembers can be estimated using the VertexComponentAnaly [...]
@@ -125,7 +125,7 @@ Last-Update: 2015-12-22
      SetDocSeeAlso("VertexComponentAnalysis");
 @@ -128,7 +128,7 @@
      SetParameterDescription("ua.isra", "Image Space Reconstruction Algorithm");
-
+ 
      AddChoice("ua.mdmdnmf", "MDMDNMF");
 -    SetParameterDescription("ua.mdmdnmf", "Minimum Dispertion Constrained Non Negative Matrix Factorization");
 +    SetParameterDescription("ua.mdmdnmf", "Minimum Dispersion Constrained Non Negative Matrix Factorization");
@@ -136,7 +136,7 @@ Last-Update: 2015-12-22
 +++ otb/Modules/Applications/AppImageUtils/app/otbColorMapping.cxx
 @@ -250,10 +250,10 @@
      SetDescription("Maps an input label image to 8-bits RGB using look-up tables.");
-
+ 
      SetDocName("Color Mapping");
 -    SetDocLongDescription("This application allows to map a label image to a 8-bits RGB image (in both ways) using different methods.\n"
 -                          " -The custom method allows to use a custom look-up table. The look-up table is loaded "
@@ -151,7 +151,7 @@ Last-Update: 2015-12-22
 --- otb.orig/Modules/Applications/AppImageUtils/app/otbDownloadSRTMTiles.cxx
 +++ otb/Modules/Applications/AppImageUtils/app/otbDownloadSRTMTiles.cxx
 @@ -96,7 +96,7 @@
-
+ 
      // Documentation
      SetDocName("Download or list SRTM tiles related to a set of images");
 -    SetDocLongDescription("This application allows to select the appropriate SRTM tiles that covers a list of images. It builds a list of the required tiles. Two modes are available: the first one download those tiles from the USGS SRTM3 website (http://dds.cr.usgs.gov/srtm/version2_1/SRTM3/), the second one list those tiles in a local directory. In both cases, you need to indicate the directory in which directory  tiles will be download or the location of local SRTM files.");
@@ -174,21 +174,21 @@ Last-Update: 2015-12-22
 +++ otb/Modules/Applications/AppImageUtils/app/otbReadImageInfo.cxx
 @@ -179,7 +179,7 @@
      EnableParameter("country");
-
+ 
      AddParameter(ParameterType_Group, "rgb", "Default RGB Display");
 -    SetParameterDescription("rgb","This group of parameters allows to access to the default rgb composition.");
 +    SetParameterDescription("rgb","This group of parameters allows one to access to the default rgb composition.");
-
+ 
      AddParameter(ParameterType_Int, "rgb.r", "Red Band");
      SetParameterDescription("rgb.r","Red band Number");
 @@ -491,7 +491,7 @@
        ossOutput << "\t" << GetParameterString("keyword") << std::endl;
        }
-
+ 
 -    //Display image informations in the dedicated logger
 +    //Display image information in the dedicated logger
      otbAppLogINFO( << ossOutput.str() );
-
+ 
      if(IsParameterEnabled("outkwl"))
 --- otb.orig/Modules/Applications/AppMathParserX/app/otbBandMathX.cxx
 +++ otb/Modules/Applications/AppMathParserX/app/otbBandMathX.cxx
@@ -212,7 +212,7 @@ Last-Update: 2015-12-22
        "Finally, we strongly recommend that the reader takes a look at the cookbook, where additional information can be found (http://www.orfeo-toolbox.org/packages/OTBCookBook.pdf).\n"
 @@ -234,5 +234,3 @@
  } // namespace otb
-
+ 
  OTB_APPLICATION_EXPORT(otb::Wrapper::BandMathX)
 -
 -
@@ -232,16 +232,16 @@ Last-Update: 2015-12-22
  "If the sensor is not supported by the metadata interface factory of OTB, users still have the possibility to give the needed parameters to the application.\n"
  "For TOA conversion, these parameters are : \n"
 @@ -198,7 +198,7 @@
-
+ 
      AddParameter(ParameterType_Empty, "milli", "Convert to milli reflectance");
      SetParameterDescription("milli", "Flag to use milli-reflectance instead of reflectance.\n"
 -                            "This allows to save the image with integer pixel type (in the range [0, 1000]  instead of floating point in the range [0, 1]. In order to do that, use this option and set the output pixel type (-out filename double for example)");
 +                            "This allows one to save the image with integer pixel type (in the range [0, 1000]  instead of floating point in the range [0, 1]. In order to do that, use this option and set the output pixel type (-out filename double for example)");
      DisableParameter("milli");
      MandatoryOff("milli");
-
+ 
 @@ -209,7 +209,7 @@
-
+ 
      //Acquisition parameters
      AddParameter(ParameterType_Group,"acqui","Acquisition parameters");
 -    SetParameterDescription("acqui","This group allows to set the parameters related to the acquisition conditions.");
@@ -250,7 +250,7 @@ Last-Update: 2015-12-22
      AddParameter(ParameterType_Int, "acqui.minute",   "Minute");
      SetParameterDescription("acqui.minute", "Minute (0-59)");
 @@ -285,7 +285,7 @@
-
+ 
      //Atmospheric parameters (TOC)
      AddParameter(ParameterType_Group,"atmo","Atmospheric parameters (for TOC)");
 -    SetParameterDescription("atmo","This group allows to set the atmospheric parameters.");
@@ -262,27 +262,27 @@ Last-Update: 2015-12-22
 +++ otb/Modules/Applications/AppProjection/app/otbGenerateRPCSensorModel.cxx
 @@ -60,7 +60,7 @@
      SetDescription("Generate a RPC sensor model from a list of Ground Control Points.");
-
+ 
      SetDocName("Generate a RPC sensor model");
 -    SetDocLongDescription("This application generates a RPC sensor model from a list of Ground Control Points. At least 20 points are required for estimation wihtout elevation support, and 40 points for estimation with elevation support. Elevation support will be automatically deactivated if an insufficient amount of points is provided. The application can optionnaly output a file containing accuracy statistics for each point, and a vector file containing segments represening points res [...]
 +    SetDocLongDescription("This application generates a RPC sensor model from a list of Ground Control Points. At least 20 points are required for estimation wihtout elevation support, and 40 points for estimation with elevation support. Elevation support will be automatically deactivated if an insufficient amount of points is provided. The application can optionnaly output a file containing accuracy statistics for each point, and a vector file containing segments represening points res [...]
-
+ 
      AddDocTag(Tags::Geometry);
-
+ 
 --- otb.orig/Modules/Applications/AppProjection/app/otbGridBasedImageResampling.cxx
 +++ otb/Modules/Applications/AppProjection/app/otbGridBasedImageResampling.cxx
 @@ -107,7 +107,7 @@
      SetDescription("Resamples an image according to a resampling grid");
-
+ 
      SetDocName("Grid Based Image Resampling");
 -    SetDocLongDescription("This application allows to perform image resampling from an input resampling grid.");
 +    SetDocLongDescription("This application allows one to perform image resampling from an input resampling grid.");
      SetDocLimitations("None");
      SetDocAuthors("OTB-Team");
-
+ 
 @@ -116,7 +116,7 @@
      SetDocSeeAlso("otbStereorecificationGridGeneration");
-
+ 
      AddParameter(ParameterType_Group,"io","Input and output data");
 -    SetParameterDescription("io","This group of parameters allows to set the input and output images.");
 +    SetParameterDescription("io","This group of parameters allows one to set the input and output images.");
@@ -299,7 +299,7 @@ Last-Update: 2015-12-22
      SetParameterDescription("grid.type.def","A deformation grid contains at each grid position the offset to apply to this position in order to get to the corresponding point in the input image to resample");
      AddChoice("grid.type.loc","Localisation grid: $G(x_out,y_out) = (x_in, y_in)$");
 @@ -161,14 +161,14 @@
-
+ 
      // Interpolators
      AddParameter(ParameterType_Choice,   "interpolator", "Interpolation");
 -    SetParameterDescription("interpolator","This group of parameters allows to define how the input image will be interpolated during resampling.");
@@ -314,7 +314,7 @@ Last-Update: 2015-12-22
 +    SetParameterDescription("interpolator.bco.radius","This parameter allows one to control the size of the bicubic interpolation filter. If the target pixel size is higher than the input pixel size, increasing this parameter will reduce aliasing artefacts.");
      SetDefaultParameterInt("interpolator.bco.radius", 2);
      SetParameterString("interpolator","bco");
-
+ 
 --- otb.orig/Modules/Applications/AppProjection/app/otbOrthoRectification.cxx
 +++ otb/Modules/Applications/AppProjection/app/otbOrthoRectification.cxx
 @@ -88,7 +88,7 @@
@@ -327,7 +327,7 @@ Last-Update: 2015-12-22
      // Documentation
      SetDocName("Ortho-rectification");
 @@ -106,7 +106,7 @@
-
+ 
      // Set the parameters
      AddParameter(ParameterType_Group,"io","Input and output data");
 -    SetParameterDescription("io","This group of parameters allows to set the input and output images.");
@@ -336,12 +336,12 @@ Last-Update: 2015-12-22
      SetParameterDescription("io.in","The input image to ortho-rectify");
      AddParameter(ParameterType_OutputImage, "io.out", "Output Image");
 @@ -117,7 +117,7 @@
-
+ 
      // Add the output paramters in a group
      AddParameter(ParameterType_Group, "outputs", "Output Image Grid");
 -    SetParameterDescription("outputs","This group of parameters allows to define the grid on which the input image will be resampled.");
 +    SetParameterDescription("outputs","This group of parameters allows one to define the grid on which the input image will be resampled.");
-
+ 
      // UserDefined values
      AddParameter(ParameterType_Choice, "outputs.mode", "Parameters estimation modes");
 @@ -177,7 +177,7 @@
@@ -352,7 +352,7 @@ Last-Update: 2015-12-22
 +    isotropOss << "Values overridden by user are not affected by this option.";
      SetParameterDescription("outputs.isotropic", isotropOss.str());
      EnableParameter("outputs.isotropic");
-
+ 
 @@ -193,26 +193,26 @@
      AddParameter(ParameterType_Choice,   "interpolator", "Interpolation");
      AddChoice("interpolator.bco",    "Bicubic interpolation");
@@ -369,7 +369,7 @@ Last-Update: 2015-12-22
      AddParameter(ParameterType_Group,"opt","Speed optimization parameters");
 -    SetParameterDescription("opt","This group of parameters allows to optimize processing time.");
 +    SetParameterDescription("opt","This group of parameters allows one to optimize processing time.");
-
+ 
      // Estimate a RPC model (for spot image for instance)
      AddParameter(ParameterType_Int, "opt.rpc", "RPC modeling (points per axis)");
      SetDefaultParameterInt("opt.rpc", 10);
@@ -377,38 +377,38 @@ Last-Update: 2015-12-22
 +    SetParameterDescription("opt.rpc","Enabling RPC modeling allows one to speed-up SPOT5 ortho-rectification. Value is the number of control points per axis for RPC estimation");
      DisableParameter("opt.rpc");
      MandatoryOff("opt.rpc");
-
+ 
      // RAM available
      AddRAMParameter("opt.ram");
 -    SetParameterDescription("opt.ram","This allows to set the maximum amount of RAM available for processing. As the writing task is time consuming, it is better to write large pieces of data, which can be achieved by increasing this parameter (pay attention to your system capabilities)");
 +    SetParameterDescription("opt.ram","This allows one to set the maximum amount of RAM available for processing. As the writing task is time consuming, it is better to write large pieces of data, which can be achieved by increasing this parameter (pay attention to your system capabilities)");
-
+ 
      // Displacement Field Spacing
      AddParameter(ParameterType_Float, "opt.gridspacing", "Resampling grid spacing");
 --- otb.orig/Modules/Applications/AppProjection/app/otbRefineSensorModel.cxx
 +++ otb/Modules/Applications/AppProjection/app/otbRefineSensorModel.cxx
 @@ -59,7 +59,7 @@
      SetDescription("Perform least-square fit of a sensor model to a set of tie points");
-
+ 
      SetDocName("Refine Sensor Model");
 -    SetDocLongDescription("This application reads a geom file containing a sensor model and a text file containing a list of ground control point, and performs a least-square fit of the sensor model adjustable parameters to these tie points. It produces an updated geom file as output, as well as an optional ground control points based statistics file and a vector file containing residues. The output geom file can then be used to ortho-rectify the data more accurately. Plaease note that  [...]
 +    SetDocLongDescription("This application reads a geom file containing a sensor model and a text file containing a list of ground control point, and performs a least-square fit of the sensor model adjustable parameters to these tie points. It produces an updated geom file as output, as well as an optional ground control points based statistics file and a vector file containing residues. The output geom file can then be used to ortho-rectify the data more accurately. Plaease note that  [...]
-
+ 
      AddDocTag(Tags::Geometry);
-
+ 
 --- otb.orig/Modules/Applications/AppProjection/app/otbRigidTransformResample.cxx
 +++ otb/Modules/Applications/AppProjection/app/otbRigidTransformResample.cxx
 @@ -100,7 +100,7 @@
-
+ 
      //Transform
      AddParameter(ParameterType_Group,"transform","Transform parameters");
 -    SetParameterDescription("transform","This group of parameters allows to set the transformation to apply.");
 +    SetParameterDescription("transform","This group of parameters allows one to set the transformation to apply.");
-
+ 
      AddParameter(ParameterType_Choice, "transform.type", "Type of transformation");
      SetParameterDescription("transform.type","Type of transformation. Available transformations are spatial scaling, translation and rotation with scaling factor");
 @@ -148,20 +148,20 @@
-
+ 
      // Interpolators
      AddParameter(ParameterType_Choice,   "interpolator", "Interpolation");
 -    SetParameterDescription("interpolator","This group of parameters allows to define how the input image will be interpolated during resampling.");
@@ -423,12 +423,12 @@ Last-Update: 2015-12-22
 +    SetParameterDescription("interpolator.bco.radius","This parameter allows one to control the size of the bicubic interpolation filter. If the target pixel size is higher than the input pixel size, increasing this parameter will reduce aliasing artefacts.");
      SetDefaultParameterInt("interpolator.bco.radius", 2);
      SetParameterString("interpolator","bco");
-
+ 
      // RAM available
      AddRAMParameter("ram");
 -    SetParameterDescription("ram","This allows to set the maximum amount of RAM available for processing. As the writing task is time consuming, it is better to write large pieces of data, which can be achieved by increasing this parameter (pay attention to your system capabilities)");
 +    SetParameterDescription("ram","This allows one to set the maximum amount of RAM available for processing. As the writing task is time consuming, it is better to write large pieces of data, which can be achieved by increasing this parameter (pay attention to your system capabilities)");
-
+ 
      // Doc example parameter settings
      SetDocExampleParameterValue("in", "qb_toulouse_sub.tif");
 --- otb.orig/Modules/Applications/AppProjection/app/otbVectorDataReprojection.cxx
@@ -464,7 +464,7 @@ Last-Update: 2015-12-22
 +++ otb/Modules/Applications/AppSegmentation/app/otbLSMSSegmentation.cxx
 @@ -217,7 +217,7 @@
      SetDescription("Second step of the exact Large-Scale Mean-Shift segmentation workflow.");
-
+ 
      SetDocName("Exact Large-Scale Mean-Shift segmentation, step 2");
 -    SetDocLongDescription("This application performs the second step of the exact Large-Scale Mean-Shift segmentation workflow (LSMS). Filtered range image and spatial image should be created with the MeanShiftSmoothing application, with modesearch parameter disabled. If spatial image is not set, the application will only process the range image and spatial radius parameter will not be taken into account. This application will produce a labeled image where neighbor pixels whose range di [...]
 +    SetDocLongDescription("This application performs the second step of the exact Large-Scale Mean-Shift segmentation workflow (LSMS). Filtered range image and spatial image should be created with the MeanShiftSmoothing application, with modesearch parameter disabled. If spatial image is not set, the application will only process the range image and spatial radius parameter will not be taken into account. This application will produce a labeled image where neighbor pixels whose range di [...]
@@ -473,14 +473,14 @@ Last-Update: 2015-12-22
      SetDocSeeAlso("MeanShiftSmoothing, LSMSSmallRegionsMerging, LSMSVectorization");
 @@ -713,5 +713,3 @@
  }
-
+ 
  OTB_APPLICATION_EXPORT(otb::Wrapper::LSMSSegmentation)
 -
 -
 --- otb.orig/Modules/Applications/AppSegmentation/app/otbSegmentation.cxx
 +++ otb/Modules/Applications/AppSegmentation/app/otbSegmentation.cxx
 @@ -138,7 +138,7 @@
-
+ 
      // Documentation
      SetDocName("Segmentation");
 -    SetDocLongDescription("This application allows to perform various segmentation algorithms on a multispectral image."
@@ -497,28 +497,28 @@ Last-Update: 2015-12-22
 +                          " and that images of any size can be processed. There are few more options in the vector mode. The simplify option allows one to simplify the geometry"
 +                          " (i.e. remove nodes in polygons) according to a user-defined tolerance. The stitch option allows one to application to try to stitch together polygons corresponding"
                            " to segmented region that may have been split by the tiling scheme. ");
-
+ 
      SetDocLimitations("In raster mode, the application can not handle large input images. Stitching step of vector mode might become slow with very large input images."
 @@ -223,7 +223,7 @@
      SetParameterDescription("mode", "Choice of processing mode, either raster or large-scale.");
-
+ 
      AddChoice("mode.vector", "Tile-based large-scale segmentation with vector output");
 -    SetParameterDescription("mode.vector","In this mode, the application will output a vector file or database, and process the input image piecewise. This allows to perform segmentation of very large images.");
 +    SetParameterDescription("mode.vector","In this mode, the application will output a vector file or database, and process the input image piecewise. This allows one to perform segmentation of very large images.");
-
+ 
      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.");
 @@ -258,7 +258,7 @@
      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");
      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.");
 @@ -298,7 +298,7 @@
-
+ 
      AddParameter(ParameterType_Float, "mode.vector.simplify", "Simplify polygons");
      SetParameterDescription("mode.vector.simplify",
 -                            "Simplify polygons according to a given tolerance (in pixel). This option allows to reduce the size of the output file or database.");
@@ -530,7 +530,7 @@ Last-Update: 2015-12-22
 +++ otb/Modules/Applications/AppStereo/app/otbBlockMatching.cxx
 @@ -127,11 +127,11 @@
      SetDescription("Performs block-matching to estimate pixel-wise disparities between two images");
-
+ 
      SetDocName("Pixel-wise Block-Matching");
 -    SetDocLongDescription("This application allows to performs block-matching to estimate pixel-wise disparities "
 -      "between two images. The application allows to choose the block-matching method to use. It also allows to input"
@@ -545,37 +545,37 @@ Last-Update: 2015-12-22
        "disparity, vertical disparity and metric value). One can split these images afterward.");
 @@ -142,7 +142,7 @@
      AddDocTag(Tags::Stereo);
-
+ 
      AddParameter(ParameterType_Group,"io","Input and output data");
 -    SetParameterDescription("io","This group of parameters allows to set the input and output images.");
 +    SetParameterDescription("io","This group of parameters allows one to set the input and output images.");
-
+ 
      AddParameter(ParameterType_InputImage,"io.inleft","Left input image");
      SetParameterDescription("io.inleft","The left input image (reference)");
 @@ -163,24 +163,24 @@
      SetParameterDescription("io.outmetric","If used, the output image will have a second component with metric optimal values");
-
+ 
      AddParameter(ParameterType_Group,"mask","Image masking parameters");
 -    SetParameterDescription("mask","This group of parameters allows to determine the masking parameters to prevent disparities estimation for some pixels of the left image");
 +    SetParameterDescription("mask","This group of parameters allows one to determine the masking parameters to prevent disparities estimation for some pixels of the left image");
-
+ 
      AddParameter(ParameterType_InputImage,"mask.inleft","Discard left pixels from mask image");
 -    SetParameterDescription("mask.inleft","This parameter allows to provide a custom mask for the left image.Block matching will be only perform on pixels inside the mask.");
 +    SetParameterDescription("mask.inleft","This parameter allows one to provide a custom mask for the left image.Block matching will be only perform on pixels inside the mask.");
      MandatoryOff("mask.inleft");
-
+ 
      AddParameter(ParameterType_InputImage,"mask.inright","Discard right pixels from mask image");
 -    SetParameterDescription("mask.inright","This parameter allows to provide a custom mask for the right image.Block matching will be perform only on pixels inside the mask.");
 +    SetParameterDescription("mask.inright","This parameter allows one to provide a custom mask for the right image.Block matching will be perform only on pixels inside the mask.");
      MandatoryOff("mask.inright");
-
+ 
      AddParameter(ParameterType_Float,"mask.nodata","Discard pixels with no-data value");
 -    SetParameterDescription("mask.nodata","This parameter allows to discard pixels whose value is equal to the user-defined no-data value.");
 +    SetParameterDescription("mask.nodata","This parameter allows one to discard pixels whose value is equal to the user-defined no-data value.");
      MandatoryOff("mask.nodata");
      SetDefaultParameterFloat("mask.nodata",0.);
      DisableParameter("mask.nodata");
-
+ 
      AddParameter(ParameterType_Float,"mask.variancet","Discard pixels with low local variance");
 -    SetParameterDescription("mask.variancet","This parameter allows to discard pixels whose local variance is too small (the size of the neighborhood is given by the radius parameter)");
 +    SetParameterDescription("mask.variancet","This parameter allows one to discard pixels whose local variance is too small (the size of the neighborhood is given by the radius parameter)");
@@ -586,35 +586,35 @@ Last-Update: 2015-12-22
 +++ otb/Modules/Applications/AppStereo/app/otbDisparityMapToElevationMap.cxx
 @@ -76,7 +76,7 @@
      AddDocTag(Tags::Stereo);
-
+ 
      AddParameter(ParameterType_Group,"io","Input and output data");
 -    SetParameterDescription("io","This group of parameters allows to set the input and output images and grids.");
 +    SetParameterDescription("io","This group of parameters allows one to set the input and output images and grids.");
-
+ 
      AddParameter(ParameterType_InputImage,"io.in","Input disparity map");
      SetParameterDescription("io.in","The input disparity map (horizontal disparity in first band, vertical in second)");
 --- otb.orig/Modules/Applications/AppStereo/app/otbStereoFramework.cxx
 +++ otb/Modules/Applications/AppStereo/app/otbStereoFramework.cxx
 @@ -341,7 +341,7 @@
-
+ 
      // Add the output paramters in a group
      AddParameter(ParameterType_Group, "input", "Input parameters");
 -    SetParameterDescription("input","This group of parameters allows to parametrize input data.");
 +    SetParameterDescription("input","This group of parameters allows one to parametrize input data.");
-
+ 
      AddParameter(ParameterType_InputImageList,  "input.il",   "Input images list");
      SetParameterDescription("input.il", "The list of images.");
 @@ -362,7 +362,7 @@
-
+ 
      // Add the output paramters in a group
      AddParameter(ParameterType_Group, "output", "Output parameters");
 -    SetParameterDescription("output","This group of parameters allows to choose the DSM resolution, nodata value, and projection parameters.");
 +    SetParameterDescription("output","This group of parameters allows one to choose the DSM resolution, nodata value, and projection parameters.");
-
+ 
      // // Build the Output Map Projection
      // for custom map projection
 @@ -380,7 +380,7 @@
-
+ 
      // UserDefined values
      AddParameter(ParameterType_Choice, "output.fusionmethod", "Method to fuse measures in each DSM cell");
 -    SetParameterDescription("output.fusionmethod","This parameter allows to choose the method used to fuse elevation measurements in each output DSM cell");
@@ -623,17 +623,17 @@ Last-Update: 2015-12-22
      AddChoice("output.fusionmethod.min", "The cell is filled with the minimum measured elevation values");
      AddChoice("output.fusionmethod.mean","The cell is filled with the mean of measured elevation values");
 @@ -419,7 +419,7 @@
-
+ 
      // Add the output paramters in a group
      AddParameter(ParameterType_Group, "stereorect", "Stereorectification Grid parameters");
 -    SetParameterDescription("stereorect","This group of parameters allows to choose direct and inverse grid subsampling. These parameters are very useful to tune time and memory consumption.");
 +    SetParameterDescription("stereorect","This group of parameters allows one to choose direct and inverse grid subsampling. These parameters are very useful to tune time and memory consumption.");
-
+ 
      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");
 @@ -427,7 +427,7 @@
      MandatoryOff("stereorect.fwdgridstep");
-
+ 
      AddParameter(ParameterType_Int, "stereorect.invgridssrate", "Sub-sampling rate for epipolar grid inversion");
 -    SetParameterDescription("stereorect.invgridssrate","Grid inversion is an heavy process that implies spline regression on control points. To avoid eating to much memory, this parameter allows to first sub-sample the field to invert.");
 +    SetParameterDescription("stereorect.invgridssrate","Grid inversion is an heavy process that implies spline regression on control points. To avoid eating to much memory, this parameter allows one to first sub-sample the field to invert.");
@@ -642,7 +642,7 @@ Last-Update: 2015-12-22
      MandatoryOff("stereorect.invgridssrate");
 @@ -506,7 +506,7 @@
      DisableParameter("mask.right");
-
+ 
      AddParameter(ParameterType_Float,"mask.variancet","Discard pixels with low local variance");
 -    SetParameterDescription("mask.variancet","This parameter allows to discard pixels whose local variance is too small (the size of the neighborhood is given by the radius parameter)");
 +    SetParameterDescription("mask.variancet","This parameter allows one to discard pixels whose local variance is too small (the size of the neighborhood is given by the radius parameter)");
@@ -653,72 +653,72 @@ Last-Update: 2015-12-22
 +++ otb/Modules/Applications/AppStereo/app/otbStereoRectificationGridGenerator.cxx
 @@ -111,7 +111,7 @@
      SetDocSeeAlso("otbGridBasedImageResampling");
-
+ 
      AddParameter(ParameterType_Group,"io","Input and output data");
 -    SetParameterDescription("io","This group of parameters allows to set the input and output images.");
 +    SetParameterDescription("io","This group of parameters allows one to set the input and output images.");
      AddParameter(ParameterType_InputImage,"io.inleft","Left input image");
      SetParameterDescription("io.inleft","The left input image to resample");
-
+ 
 @@ -155,11 +155,11 @@
      DisableParameter("epi.elevation.avgdem.maxdisp");
-
+ 
      AddParameter(ParameterType_Float,"epi.scale","Scale of epipolar images");
 -    SetParameterDescription("epi.scale","The scale parameter allows to generated zoomed-in (scale < 1) or zoomed-out (scale > 1) epipolar images.");
 +    SetParameterDescription("epi.scale","The scale parameter allows one to generated zoomed-in (scale < 1) or zoomed-out (scale > 1) epipolar images.");
      SetDefaultParameterFloat("epi.scale",1.);
-
+ 
      AddParameter(ParameterType_Int,"epi.step","Step of the deformation grid (in nb. of pixels)");
 -    SetParameterDescription("epi.step","Stereo-rectification deformation grid only varies slowly. Therefore, it is recommanded to use a coarser grid (higher step value) in case of large images");
 +    SetParameterDescription("epi.step","Stereo-rectification deformation grid only varies slowly. Therefore, it is recommended to use a coarser grid (higher step value) in case of large images");
      SetDefaultParameterInt("epi.step",1);
-
+ 
      AddParameter(ParameterType_Int,"epi.rectsizex","Rectified image size X");
 @@ -175,7 +175,7 @@
      SetParameterRole("epi.baseline", Role_Output);
-
+ 
      AddParameter(ParameterType_Group,"inverse","Write inverse fields");
 -    SetParameterDescription("inverse","This group of parameter allows to generate the inverse fields as well");
 +    SetParameterDescription("inverse","This group of parameter allows one to generate the inverse fields as well");
-
+ 
      AddParameter(ParameterType_OutputImage, "inverse.outleft", "Left inverse deformation grid");
      SetParameterDescription("inverse.outleft","The output deformation grid to be used to resample the epipolar left image");
 @@ -186,7 +186,7 @@
      MandatoryOff("inverse.outright");
-
+ 
      AddParameter(ParameterType_Int, "inverse.ssrate", "Sub-sampling rate for inversion");
 -    SetParameterDescription("inverse.ssrate","Grid inversion is an heavy process that implies spline regression on control points. To avoid eating to much memory, this parameter allows to first sub-sample the field to invert.");
 +    SetParameterDescription("inverse.ssrate","Grid inversion is an heavy process that implies spline regression on control points. To avoid eating to much memory, this parameter allows one to first sub-sample the field to invert.");
      SetDefaultParameterInt("inverse.ssrate",16);
      SetMinimumParameterIntValue("inverse.ssrate",1);
-
+ 
 --- otb.orig/Modules/Applications/AppTextures/app/otbHaralickTextureExtraction.cxx
 +++ otb/Modules/Applications/AppTextures/app/otbHaralickTextureExtraction.cxx
 @@ -90,7 +90,7 @@
  AddRAMParameter();
-
+ 
  AddParameter(ParameterType_Group, "parameters", "Texture feature parameters");
 -SetParameterDescription("parameters","This group of parameters allows to define texture parameters.");
 +SetParameterDescription("parameters","This group of parameters allows one to define texture parameters.");
-
+ 
  AddParameter(ParameterType_Int,"parameters.xrad","X Radius");
  SetParameterDescription("parameters.xrad", "X Radius");
 --- otb.orig/Modules/Applications/AppTextures/app/otbSFSTextureExtraction.cxx
 +++ otb/Modules/Applications/AppTextures/app/otbSFSTextureExtraction.cxx
 @@ -81,7 +81,7 @@
  AddRAMParameter();
-
+ 
  AddParameter(ParameterType_Group, "parameters", "Texture feature parameters");
 -SetParameterDescription("parameters","This group of parameters allows to define SFS texture parameters.\
 +SetParameterDescription("parameters","This group of parameters allows one to define SFS texture parameters.\
      The available texture features are SFS'Length, SFS'Width, SFS'PSI, SFS'W-Mean, SFS'Ratio and SFS'SD.\
      They are provided in this exact order in the output image.");
-
+ 
 --- otb.orig/Modules/Applications/AppVectorDataTranslation/app/otbRasterization.cxx
 +++ otb/Modules/Applications/AppVectorDataTranslation/app/otbRasterization.cxx
 @@ -63,7 +63,7 @@
      SetDescription("Rasterize a vector dataset.");
-
+ 
      SetDocName("Rasterization");
 -    SetDocLongDescription("This application allows to reproject and rasterize a vector dataset. The grid of the rasterized output can be set by using a reference image, or by setting all parmeters (origin, size, spacing) by hand. In the latter case, at least the spacing (ground sampling distance) is needed (other parameters are computed automatically). The rasterized output can also be in a different projection reference system than the input dataset.\n There are two rasterize mode avai [...]
 +    SetDocLongDescription("This application allows one to reproject and rasterize a vector dataset. The grid of the rasterized output can be set by using a reference image, or by setting all parmeters (origin, size, spacing) by hand. In the latter case, at least the spacing (ground sampling distance) is needed (other parameters are computed automatically). The rasterized output can also be in a different projection reference system than the input dataset.\n There are two rasterize mode  [...]
@@ -738,13 +738,13 @@ Last-Update: 2015-12-22
  //
 @@ -91,7 +91,7 @@
    image->SetRegions(region);
-
+ 
    // Software Guide : BeginLatex
 -  // Since the pixel dimensionality is choosen at runtime, one has to
 +  // Since the pixel dimensionality is chosen at runtime, one has to
    // pass this parameter to the image before memory allocation.
    // Software Guide : EndLatex
-
+ 
 --- otb.orig/Modules/Applications/AppClassification/app/otbComputePolylineFeatureFromImage.cxx
 +++ otb/Modules/Applications/AppClassification/app/otbComputePolylineFeatureFromImage.cxx
 @@ -76,10 +76,10 @@
@@ -753,7 +753,7 @@ Last-Update: 2015-12-22
      SetName("ComputePolylineFeatureFromImage");
 -    SetDescription("This application compute for each studied polyline, contained in the input VectorData, the choosen descriptors.");
 +    SetDescription("This application compute for each studied polyline, contained in the input VectorData, the chosen descriptors.");
-
+ 
      SetDocName("Compute Polyline Feature From Image");
 -    SetDocLongDescription("The first step in the classifier fusion based validation is to compute, for each studied polyline, the choosen descriptors. ");
 +    SetDocLongDescription("The first step in the classifier fusion based validation is to compute, for each studied polyline, the chosen descriptors. ");
@@ -780,7 +780,7 @@ Last-Update: 2015-12-22
 -  // First clear previous file choosen
 +  // First clear previous file chosen
    this->ClearValue();
-
+ 
    // No file existence is done here :
 --- otb.orig/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageListParameter.cxx
 +++ otb/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageListParameter.cxx
@@ -791,7 +791,7 @@ Last-Update: 2015-12-22
 -  // First clear previous file choosen
 +  // First clear previous file chosen
    this->ClearValue();
-
+ 
    bool isOk = true;
 --- otb.orig/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameter.cxx
 +++ otb/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameter.cxx
@@ -802,7 +802,7 @@ Last-Update: 2015-12-22
 -  // First clear previous file choosen
 +  // First clear previous file chosen
    this->ClearValue();
-
+ 
    // No file existence is done here :
 --- otb.orig/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputVectorDataListParameter.cxx
 +++ otb/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputVectorDataListParameter.cxx
@@ -813,7 +813,7 @@ Last-Update: 2015-12-22
 -  // First clear previous file choosen
 +  // First clear previous file chosen
    this->ClearValue();
-
+ 
    bool isOk = true;
 --- otb.orig/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputVectorDataParameter.cxx
 +++ otb/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputVectorDataParameter.cxx
@@ -824,7 +824,7 @@ Last-Update: 2015-12-22
 -  // First clear previous file choosen
 +  // First clear previous file chosen
    this->ClearValue();
-
+ 
    // TODO : when the logger will be available, redirect the exception
 --- otb.orig/Examples/DataRepresentation/Mesh/PointSetWithVectors.cxx
 +++ otb/Examples/DataRepresentation/Mesh/PointSetWithVectors.cxx
@@ -849,7 +849,7 @@ Last-Update: 2015-12-22
  //
  // The first step toward the use of these filters is to include the proper header files.
 @@ -87,9 +87,9 @@
-
+ 
  // Software Guide : BeginLatex
  //
 -// You can access to subdatasets' informations available in the HDF file using
@@ -918,12 +918,12 @@ Last-Update: 2015-12-22
 -  //  More informations and data about leaf properties can be found at \emph{St\'{e}phane Jacquemoud} \href{http://teledetection.ipgp.jussieu.fr/opticleaf/}{OPTICLEAF} website.
 +  //  More information and data about leaf properties can be found at \emph{St\'{e}phane Jacquemoud} \href{http://teledetection.ipgp.jussieu.fr/opticleaf/}{OPTICLEAF} website.
    //  Software Guide : EndLatex
-
+ 
    return EXIT_SUCCESS;
 --- otb.orig/Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h
 +++ otb/Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h
 @@ -522,7 +522,7 @@
-
+ 
  #if 0
    /** Related DataSource.
 -   * Needed to acces OTB meta informations.
@@ -935,19 +935,19 @@ Last-Update: 2015-12-22
 +++ otb/Modules/Adapters/OSSIMAdapters/include/otbImageKeywordlist.h
 @@ -137,7 +137,7 @@
    virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
+ 
  private:
 -  /** Geo informations are in this map */
 +  /** Geo information are in this map */
    KeywordlistMap m_Keywordlist;
-
+ 
  //  char m_Delimiter;
 --- otb.orig/Modules/Applications/AppFusion/app/otbBundleToPerfectSensor.cxx
 +++ otb/Modules/Applications/AppFusion/app/otbBundleToPerfectSensor.cxx
 @@ -154,7 +154,7 @@
      // Setup the DEM Handler
      otb::Wrapper::ElevationParametersHandler::SetupDEMHandlerFromElevationParameters(this,"elev");
-
+ 
 -    // Set up output image informations
 +    // Set up output image information
      FloatVectorImageType::SpacingType spacing = panchro->GetSpacing();
@@ -956,30 +956,30 @@ Last-Update: 2015-12-22
 --- otb.orig/Modules/Applications/AppImageUtils/app/otbPixelValue.cxx
 +++ otb/Modules/Applications/AppImageUtils/app/otbPixelValue.cxx
 @@ -148,7 +148,7 @@
-
+ 
      SetParameterString("value", oss.str());
-
+ 
 -    //Display image informations in the dedicated logger
 +    //Display image information in the dedicated logger
      otbAppLogINFO( << oss.str() );
    }
-
+ 
 --- otb.orig/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.h
 +++ otb/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.h
 @@ -68,7 +68,7 @@
-
+ 
    /** GenerateOutputInformation
     * Set the number of bands of the output.
 -   * Copy informations from the first image of the list if existing.
 +   * Copy information from the first image of the list if existing.
     **/
    virtual void GenerateOutputInformation(void);
-
+ 
 --- otb.orig/Modules/Core/Transform/include/otbGenericRSTransform.txx
 +++ otb/Modules/Core/Transform/include/otbGenericRSTransform.txx
 @@ -65,7 +65,7 @@
  }
-
+ 
  /**
 - * Instanciate the transformation according to informations
 + * Instanciate the transformation according to information
@@ -989,14 +989,14 @@ Last-Update: 2015-12-22
 --- otb.orig/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h
 +++ otb/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h
 @@ -79,7 +79,7 @@
-
+ 
    /** GenerateOutputInformation
     * Set the number of bands of the output.
 -   * Copy informations from the first image of the list if existing.
 +   * Copy information from the first image of the list if existing.
     **/
    virtual void GenerateOutputInformation(void);
-
+ 
 --- otb.orig/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.txx
 +++ otb/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.txx
 @@ -103,7 +103,7 @@
@@ -1023,7 +1023,7 @@ Last-Update: 2015-12-22
 +++ otb/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.txx
 @@ -262,7 +262,7 @@
  }
-
+ 
  /**
 - * Instanciate the transformation according to informations
 + * Instanciate the transformation according to information
@@ -1033,49 +1033,49 @@ Last-Update: 2015-12-22
 --- otb.orig/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.h
 +++ otb/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.h
 @@ -216,7 +216,7 @@
-
+ 
    /** GenerateOutputInformation
      * Set the size of the output image depending on the decimation factor
 -    * Copy informations from the input image if existing.
 +    * Copy information from the input image if existing.
      **/
    virtual void GenerateOutputInformation();
-
+ 
 @@ -401,7 +401,7 @@
-
+ 
    /** GenerateOutputInformation
      * Set the size of the output image depending on the decimation factor
 -    * Copy informations from the input image if existing.
 +    * Copy information from the input image if existing.
      **/
    virtual void GenerateOutputInformation();
-
+ 
 --- otb.orig/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.h
 +++ otb/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.h
 @@ -325,7 +325,7 @@
-
+ 
    /** GenerateOutputInformation
      * Set the size of the output image depending on the decimation factor
 -    * Copy informations from the input image if existing.
 +    * Copy information from the input image if existing.
      **/
    virtual void GenerateOutputInformation();
-
+ 
 --- otb.orig/Modules/Filtering/Wavelet/include/otbWaveletTransform.h
 +++ otb/Modules/Filtering/Wavelet/include/otbWaveletTransform.h
 @@ -308,7 +308,7 @@
-
+ 
    /** GenerateOutputInformation
      * Set the size of the output image depending on the decimation factor
 -    * Copy informations from the input image if existing.
 +    * Copy information from the input image if existing.
      **/
    virtual void GenerateOutputInformation();
-
+ 
 --- otb.orig/Modules/IO/Carto/include/otbWorldFile.h
 +++ otb/Modules/IO/Carto/include/otbWorldFile.h
 @@ -28,7 +28,7 @@
-
+ 
  /**
   * \class WorldFile
 - * \brief Handles the world file that associates geographic informations to png, jpg
@@ -1088,12 +1088,12 @@ Last-Update: 2015-12-22
 @@ -193,7 +193,7 @@
            // Get the value of the key
            std::string resultValue = currentTag->Attribute("v");
-
+ 
 -          // Fill the element informations
 +          // Fill the element information
            elementPair.first  = result;
            elementPair.second = resultValue;
-
+ 
 --- otb.orig/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToReaderOptions.h
 +++ otb/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToReaderOptions.h
 @@ -30,8 +30,8 @@
@@ -1112,11 +1112,11 @@ Last-Update: 2015-12-22
 @@ -139,7 +139,7 @@
    BSQImageIO(const Self &); //purposely not implemented
    void operator =(const Self&); //purposely not implemented
-
+ 
 -  /** Internal method to read header informations */
 +  /** Internal method to read header information */
    bool InternalReadHeaderInformation(const std::string& file_name, std::fstream& file, const bool reportError);
-
+ 
  #define otbSwappFileOrderToSystemOrderMacro(StrongType, buffer, buffer_size) \
 --- otb.orig/Modules/IO/IOBSQ/src/otbBSQImageIO.cxx
 +++ otb/Modules/IO/IOBSQ/src/otbBSQImageIO.cxx
@@ -1132,16 +1132,16 @@ Last-Update: 2015-12-22
 @@ -231,7 +231,7 @@
      itkExceptionMacro(<< "BSQImageIO::ReadImageInformation() failed header open ! ");
      }
-
+ 
 -  //Read header informations
 +  //Read header information
    InternalReadHeaderInformation(m_FileName, m_HeaderFile, true);
-
+ 
    otbMsgDebugMacro(<< "Driver to read: BSQ");
 @@ -375,7 +375,7 @@
      }
    file >> m_Dimensions[0];
-
+ 
 -  //Read "BITS PER PIXEL" informations
 +  //Read "BITS PER PIXEL" information
    file >> lString;
@@ -1150,7 +1150,7 @@ Last-Update: 2015-12-22
 @@ -397,7 +397,7 @@
    int lNbBitsPerPixels;
    file >> lNbBitsPerPixels;
-
+ 
 -  //Read "SENSCODAGE" informations (optionnal)
 +  //Read "SENSCODAGE" information (optionnal)
    file >> lString;
@@ -1159,12 +1159,12 @@ Last-Update: 2015-12-22
 @@ -616,11 +616,11 @@
    m_HeaderFile <<  "COLUMNS" << std::endl;
    m_HeaderFile << m_Dimensions[0] << std::endl;
-
+ 
 -  //Write "BITS PER PIXEL" informations
 +  //Write "BITS PER PIXEL" information
    m_HeaderFile <<  "BITS PER PIXEL" << std::endl;
    m_HeaderFile << this->GetComponentSize() * 8 << std::endl;
-
+ 
 -  //Write "SENSCODAGE" informations
 +  //Write "SENSCODAGE" information
    m_HeaderFile <<  "SENSCODAGE" << std::endl;
@@ -1174,22 +1174,22 @@ Last-Update: 2015-12-22
 +++ otb/Modules/IO/IOGDAL/test/otbGDALImageIOTestWriteMetadata.cxx
 @@ -564,7 +564,7 @@
                      abyRaster, 128, 128, GDT_Byte, 0, 0 );
-
-
+ 
+ 
 -  // Get some informations from dataset
 +  // Get some information from dataset
    infoDatasetCreate->m_Name = "Create";
    infoDatasetCreate->m_ProjRef = static_cast<std::string>(poDstDS->GetProjectionRef());
-
+ 
 @@ -593,7 +593,7 @@
    if( poDataset == NULL )
       return false;
-
+ 
 -  // Get some informations from file
 +  // Get some information from file
    infoDatasetWR->m_Name = "WR";
    infoDatasetWR->m_ProjRef = static_cast<std::string>(poDataset->GetProjectionRef());
-
+ 
 --- otb.orig/Modules/IO/IOGDAL/test/otbGDALReadPxlComplex.cxx
 +++ otb/Modules/IO/IOGDAL/test/otbGDALReadPxlComplex.cxx
 @@ -38,7 +38,7 @@
@@ -1204,18 +1204,18 @@ Last-Update: 2015-12-22
 @@ -56,7 +56,7 @@
    if( poDataset == NULL )
       return EXIT_FAILURE;
-
+ 
 -  // Get some informations from file
 +  // Get some information from file
    int nbBand = poDataset->GetRasterCount();
-
+ 
    GDALDataType pxlTypeInFile = poDataset->GetRasterBand(1)->GetRasterDataType();
 --- otb.orig/Modules/IO/IOLUM/include/otbLUMImageIO.h
 +++ otb/Modules/IO/IOLUM/include/otbLUMImageIO.h
 @@ -137,7 +137,7 @@
    LUMImageIO(const Self &); //purposely not implemented
    void operator =(const Self&); //purposely not implemented
-
+ 
 -  /** Internal method to read header informations */
 +  /** Internal method to read header information */
    bool InternalReadHeaderInformation(std::fstream& file, const bool reportError);
@@ -1226,7 +1226,7 @@ Last-Update: 2015-12-22
 @@ -106,7 +106,7 @@
      return false;
      }
-
+ 
 -  //Read header informations
 +  //Read header information
    bool lResult = InternalReadHeaderInformation(header_file, false);
@@ -1235,11 +1235,11 @@ Last-Update: 2015-12-22
 @@ -195,7 +195,7 @@
      itkExceptionMacro(<< "LUMImageIO::ReadImageInformation() failed header open ! ");
      }
-
+ 
 -  //Read header informations
 +  //Read header information
    InternalReadHeaderInformation(m_File, true);
-
+ 
    otbMsgDebugMacro(<< "Driver to read: LUM");
 @@ -227,7 +227,7 @@
      {
@@ -1253,7 +1253,7 @@ Last-Update: 2015-12-22
 @@ -300,7 +300,7 @@
    otbSwappFileOrderToSystemOrderMacro(int, &NbCol, 1);
    otbSwappFileOrderToSystemOrderMacro(int, &NbLig, 1);
-
+ 
 -  //Initialization of image informations
 +  //Initialization of image information
    m_Dimensions[0] = NbCol;
@@ -1262,9 +1262,9 @@ Last-Update: 2015-12-22
 --- otb.orig/Modules/IO/IOMW/include/otbMWImageIO.h
 +++ otb/Modules/IO/IOMW/include/otbMWImageIO.h
 @@ -141,7 +141,7 @@
-
+ 
    std::string GetExtension(const std::string& filename);
-
+ 
 -  /** Internal method to read header informations */
 +  /** Internal method to read header information */
    bool InternalReadHeaderInformation(std::fstream& file, const bool reportError);
@@ -1275,7 +1275,7 @@ Last-Update: 2015-12-22
 @@ -91,7 +91,7 @@
      return false;
      }
-
+ 
 -  //Read header informations
 +  //Read header information
    bool lResult = InternalReadHeaderInformation(header_file, false);
@@ -1284,16 +1284,16 @@ Last-Update: 2015-12-22
 @@ -172,7 +172,7 @@
      itkExceptionMacro(<< "MWImageIO::ReadImageInformation() failed header open ! ");
      }
-
+ 
 -  //Read header informations
 +  //Read header information
    InternalReadHeaderInformation(m_File, true);
-
+ 
    otbMsgDebugMacro(<< "Driver to read: MW");
 @@ -227,7 +227,7 @@
-
+ 
    SetComponentType(FLOAT);
-
+ 
 -  //Initialization of image informations
 +  //Initialization of image information
    m_Dimensions[0] = NbCol;
@@ -1304,18 +1304,18 @@ Last-Update: 2015-12-22
 @@ -139,7 +139,7 @@
    RADImageIO(const Self &); //purposely not implemented
    void operator =(const Self&); //purposely not implemented
-
+ 
 -  /** Internal method to read header informations */
 +  /** Internal method to read header information */
    bool InternalReadHeaderInformation(const std::string& file_name, std::fstream& file, const bool reportError);
-
+ 
  #define otbSwappFileOrderToSystemOrderMacro(StrongType, buffer, buffer_size) \
 --- otb.orig/Modules/IO/IORAD/src/otbRADImageIO.cxx
 +++ otb/Modules/IO/IORAD/src/otbRADImageIO.cxx
 @@ -112,7 +112,7 @@
      return false;
      }
-
+ 
 -  //Read header informations
 +  //Read header information
    bool lResult = InternalReadHeaderInformation(lFileName, header_file, false);
@@ -1324,16 +1324,16 @@ Last-Update: 2015-12-22
 @@ -236,7 +236,7 @@
      itkExceptionMacro(<< "RADImageIO::ReadImageInformation() failed header open ! ");
      }
-
+ 
 -  //Read header informations
 +  //Read header information
    InternalReadHeaderInformation(m_FileName, m_HeaderFile, true);
-
+ 
    otbMsgDebugMacro(<< "Driver to read: RAD");
 @@ -416,7 +416,7 @@
        }
      }
-
+ 
 -  // Read "SENSCODAGE" informations (optionnal)
 +  // Read "SENSCODAGE" information (optionnal)
    file >> lString;
@@ -1342,7 +1342,7 @@ Last-Update: 2015-12-22
 @@ -704,7 +704,7 @@
      }
    m_HeaderFile << m_TypeRAD << std::endl;
-
+ 
 -  //Write "SENSCODAGE" informations
 +  //Write "SENSCODAGE" information
    m_HeaderFile <<  "SENSCODAGE "; // << std::endl;
@@ -1353,7 +1353,7 @@ Last-Update: 2015-12-22
 @@ -209,7 +209,7 @@
    std::ostringstream filename;
    BuildFileName(quad2, filename);
-
+ 
 -  // Build tile informations
 +  // Build tile information
    TileNameAndCoordType lTileInfos;
@@ -1362,56 +1362,56 @@ Last-Update: 2015-12-22
 --- otb.orig/Modules/IO/ImageIO/include/otbImageSeriesFileReader.h
 +++ otb/Modules/IO/ImageIO/include/otbImageSeriesFileReader.h
 @@ -57,7 +57,7 @@
-
+ 
    /** Creation through object factory macro */
    itkNewMacro(Self);
 -  /** Runtime informations macro */
 +  /** Runtime information macro */
    itkTypeMacro(ImageSeriesFileReader, ImageSeriesFileReaderBase);
-
+ 
    typedef typename Superclass::OutputImageType        OutputImageType;
 @@ -170,7 +170,7 @@
-
+ 
    /** Creation through object factory macro */
    itkNewMacro(Self);
 -  /** Runtime informations macro */
 +  /** Runtime information macro */
    itkTypeMacro(ImageSeriesFileReader, ImageSeriesFileReaderBase);
-
+ 
    typedef typename Superclass::OutputImageType        OutputImageType;
 @@ -276,7 +276,7 @@
-
+ 
    /** Creation through object factory macro */
    itkNewMacro(Self);
 -  /** Runtime informations macro */
 +  /** Runtime information macro */
    itkTypeMacro(ImageSeriesFileReader, ImageSeriesFileReaderBase);
-
+ 
    typedef typename Superclass::OutputImageType        OutputImageType;
 @@ -383,7 +383,7 @@
-
+ 
    /** Creation through object factory macro */
    itkNewMacro(Self);
 -  /** Runtime informations macro */
 +  /** Runtime information macro */
    itkTypeMacro(ImageSeriesFileReader, ImageSeriesFileReaderBase);
-
+ 
    typedef typename Superclass::OutputImageType        OutputImageType;
 --- otb.orig/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h
 +++ otb/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h
 @@ -71,7 +71,7 @@
-
+ 
    /** Creation through object factory macro */
    itkNewMacro(Self);
 -  /** Runtime informations macro */
 +  /** Runtime information macro */
    itkTypeMacro(ImageSeriesFileReaderBase, ImageListSource);
-
+ 
    typedef TImage                                      OutputImageType;
 --- otb.orig/Modules/IO/KMZWriter/include/otbKmzProductWriter.h
 +++ otb/Modules/IO/KMZWriter/include/otbKmzProductWriter.h
 @@ -44,7 +44,7 @@
-
+ 
  /** \class KmzProductWriter
   * \brief This class generate a Kmz from one or several input
 - * images. The inputs must have a non empty metadata informations.
@@ -1422,46 +1422,46 @@ Last-Update: 2015-12-22
 --- otb.orig/Modules/IO/KMZWriter/include/otbKmzProductWriter.txx
 +++ otb/Modules/IO/KMZWriter/include/otbKmzProductWriter.txx
 @@ -117,7 +117,7 @@
-
+ 
    if(emptyProjRef &&  emptyKWL)
      {
 -    itkExceptionMacro(<<"The input image have empty keyword list, please use an image with metadata informations");
 +    itkExceptionMacro(<<"The input image have empty keyword list, please use an image with metadata information");
      }
-
+ 
    // Continue processing
 --- otb.orig/Modules/Learning/LearningBase/include/otbDecisionTree.h
 +++ otb/Modules/Learning/LearningBase/include/otbDecisionTree.h
 @@ -68,7 +68,7 @@
-
+ 
    /** Creation through object factory macro */
    itkNewMacro(Self);
 -  /** Runtime informations macro */
 +  /** Runtime information macro */
    itkTypeMacro(DecisionTree, DataObject);
-
+ 
    typedef typename std::pair< AttributeValueType, DecisionTreeTestType > KeyType;
 --- otb.orig/Modules/Learning/SOM/include/otbPeriodicSOM.h
 +++ otb/Modules/Learning/SOM/include/otbPeriodicSOM.h
 @@ -72,7 +72,7 @@
    /** Creation through object factory macro */
    itkNewMacro(Self);
-
+ 
 -  /** Runtime informations macro */
 +  /** Runtime information macro */
    itkTypeMacro(PeriodicSOM, SOM);
-
+ 
    typedef TListSample                      ListSampleType;
 --- otb.orig/Modules/Learning/SOM/include/otbSOM.h
 +++ otb/Modules/Learning/SOM/include/otbSOM.h
 @@ -68,7 +68,7 @@
-
+ 
    /** Creation through object factory macro */
    itkNewMacro(Self);
 -  /** Runtime informations macro */
 +  /** Runtime information macro */
    itkTypeMacro(SOM, ImageSource);
-
+ 
    typedef TListSample                      ListSampleType;
 --- otb.orig/Modules/Learning/SOM/include/otbSOMMap.h
 +++ otb/Modules/Learning/SOM/include/otbSOMMap.h
@@ -1477,25 +1477,25 @@ Last-Update: 2015-12-22
 --- otb.orig/Modules/Learning/SOM/include/otbSOMWithMissingValue.h
 +++ otb/Modules/Learning/SOM/include/otbSOMWithMissingValue.h
 @@ -72,7 +72,7 @@
-
+ 
    /** Creation through object factory macro */
    itkNewMacro(Self);
 -  /** Runtime informations macro */
 +  /** Runtime information macro */
    itkTypeMacro(SOMWithMissingValue, PeriodicSOM);
-
+ 
  protected:
 --- otb.orig/Modules/Learning/SVMLearning/include/otbSVMImageClassificationWithRuleFilter.h
 +++ otb/Modules/Learning/SVMLearning/include/otbSVMImageClassificationWithRuleFilter.h
 @@ -95,7 +95,7 @@
-
+ 
    /** GenerateOutputInformation
          * Set the number of bands of the output rule image.
 -        * Copy informations from the input image if existing.
 +        * Copy information from the input image if existing.
          **/
    virtual void GenerateOutputInformation();
-
+ 
 --- otb.orig/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h
 +++ otb/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h
 @@ -71,7 +71,7 @@
@@ -1551,14 +1551,14 @@ Last-Update: 2015-12-22
 -  /** Runtime type informations */
 +  /** Runtime type information */
    itkTypeMacro(AeronetFileReader, itk::ProcessObject);
-
+ 
    /** Overiding of the GetOutput() method */
 --- otb.orig/Modules/Radiometry/OpticalCalibration/src/otbAeronetFileReader.cxx
 +++ otb/Modules/Radiometry/OpticalCalibration/src/otbAeronetFileReader.cxx
 @@ -237,7 +237,7 @@
      return;
      }
-
+ 
 -  // Read informations lines (5 lines)
 +  // Read information lines (5 lines)
    std::getline(fin, line);
@@ -1568,13 +1568,13 @@ Last-Update: 2015-12-22
 +++ otb/Modules/Radiometry/Simulation/include/otbSpectralResponse.txx
 @@ -49,7 +49,7 @@
      }
-
+ 
    int NumLigne = 26; // Go to the line 27
 -  //Ignore first 26th lines which are metadatas informations
 +  //Ignore first 26th lines which are metadatas information
    for (int i = 0; i < NumLigne; ++i)
      fin.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
-
+ 
 --- otb.orig/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.h
 +++ otb/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.h
 @@ -43,7 +43,7 @@
@@ -1622,14 +1622,14 @@ Last-Update: 2015-12-22
 --- otb.orig/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
 +++ otb/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
 @@ -87,7 +87,7 @@
-
+ 
    /** GenerateOutputInformation
     * Set the number of bands of the output.
 -   * Copy informations from the first image of the list if existing.
 +   * Copy information from the first image of the list if existing.
     **/
    virtual void GenerateOutputInformation(void);
-
+ 
 --- otb.orig/Modules/Applications/AppDimensionalityReduction/app/otbDimensionalityReduction.cxx
 +++ otb/Modules/Applications/AppDimensionalityReduction/app/otbDimensionalityReduction.cxx
 @@ -139,7 +139,7 @@
@@ -1661,7 +1661,7 @@ Last-Update: 2015-12-22
 -Noise Fraction (MNF), Fast Independant Component Analysis (FICA), Maximum
 +Noise Fraction (MNF), Fast Independent Component Analysis (FICA), Maximum
  Autocorrelation Factor (MAF), and so on.")
-
+ 
  otb_module(OTBDimensionalityReduction
 --- otb.orig/Examples/BasicFilters/BandMathFilterExample.cxx
 +++ otb/Examples/BasicFilters/BandMathFilterExample.cxx
@@ -1712,7 +1712,7 @@ Last-Update: 2015-12-22
 --- otb.orig/Examples/Filtering/RasterizationExample.cxx
 +++ otb/Examples/Filtering/RasterizationExample.cxx
 @@ -24,7 +24,7 @@
-
+ 
  // Software Guide : BeginLatex
  //
 -// The \doxygen{otb}{VectorDataToMapFilter} allows to perform
@@ -1723,7 +1723,7 @@ Last-Update: 2015-12-22
 --- otb.orig/Examples/IO/DEMHandlerExample.cxx
 +++ otb/Examples/IO/DEMHandlerExample.cxx
 @@ -68,9 +68,9 @@
-
+ 
  // Software Guide : BeginLatex
  //
 -// It allows to configure a directory containing DEM tiles (DTED or SRTM
@@ -1768,7 +1768,7 @@ Last-Update: 2015-12-22
 +  // This type of label object allows storing generic attributes. Each region can store
    // a set of attributes: in this case, Hoover instances and metrics will be stored.
    // Software Guide : EndLatex
-
+ 
 --- otb.orig/Modules/Adapters/OSSIMAdapters/include/otbDEMHandler.h
 +++ otb/Modules/Adapters/OSSIMAdapters/include/otbDEMHandler.h
 @@ -46,13 +46,13 @@
@@ -1804,7 +1804,7 @@ Last-Update: 2015-12-22
 @@ -71,7 +71,7 @@
     * it needs to be redone here for this subclass to compile properly with gcc. */
    typedef typename Superclass::ImageType ImageType;
-
+ 
 -  /** Offset typedef support. This explicit redefinition allows to Set/Get
 +  /** Offset typedef support. This explicit redefinition allows Setting/Getting
     * the location of the iterator. */
@@ -1847,7 +1847,7 @@ Last-Update: 2015-12-22
 +++ otb/Modules/Core/LabelMap/include/otbAttributesMapLabelObject.h
 @@ -37,7 +37,7 @@
  {
-
+ 
  /** \class AttributesMapLabelObjectAccessor
 - *  \brief Allows to acces a given field of an AttributesMapLabelObject
 + *  \brief Allows accessing a given field of an AttributesMapLabelObject
@@ -1855,8 +1855,8 @@ Last-Update: 2015-12-22
   * The name of the attribute to retrieve can be set by using the
   * SetAttributeName method.
 @@ -88,9 +88,9 @@
-
-
+ 
+ 
  /** \class AttributesMapMeasurementFunctor
 -*   \brief This class allows to build a measurement vector from an AttributesMapLabelObject
 +*   \brief This class allows building a measurement vector from an AttributesMapLabelObject
@@ -1996,7 +1996,7 @@ Last-Update: 2015-12-22
   * \ingroup OTBStreaming
 @@ -88,7 +88,7 @@
    itkGetMacro(MemoryPrint, MemoryPrintType);
-
+ 
    /** Set/Get the bias correction factor which will weight the
 -   * estimated memory print (allows to compensate bias between
 +   * estimated memory print (allows compensating bias between
@@ -2069,7 +2069,7 @@ Last-Update: 2015-12-22
 +++ otb/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.h
 @@ -31,7 +31,7 @@
  {
-
+ 
  /** \class GaborFilterGenerator
 - * This class allows to generate gabor filter convolution mask. The mask is stored
 + * This class allows generating a gabor filter convolution mask. The mask is stored
@@ -2161,7 +2161,7 @@ Last-Update: 2015-12-22
 +++ otb/Modules/Filtering/Polarimetry/include/otbPolarimetricData.h
 @@ -39,7 +39,7 @@
    } ArchitectureType;
-
+ 
  /** \class PolarimetricData
 -*  \brief This class allows to determine the type of architecture we get.
 +*  \brief This class allows determining the type of architecture we get.
@@ -2215,18 +2215,18 @@ Last-Update: 2015-12-22
 @@ -544,7 +544,7 @@
    itkGetConstReferenceMacro(BucketOptimization, bool);
  #endif
-
+ 
 -  /** Global shift allows to tackle down numerical instabilities by
 +  /** Global shift allows tackling down numerical instabilities by
    aligning pixel indices when performing tile processing */
    itkSetMacro(GlobalShift,InputIndexType);
-
+ 
 --- otb.orig/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.h
 +++ otb/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.h
 @@ -150,7 +150,7 @@
                               outputRegionForThread,
                               itk::ThreadIdType threadId);
-
+ 
 -  /** Allows to skip the verification of physical space between
 +  /** Allows skipping the verification of physical space between
     *  the two input images (see flag m_PhysicalSpaceCheck)
@@ -2333,13 +2333,13 @@ Last-Update: 2015-12-22
 +++ otb/Modules/IO/ImageIO/include/otbImageFileWriter.txx
 @@ -682,7 +682,7 @@
    this->ReleaseInputs();
-
+ 
    //Reset global shift on input region (box parameter)
 -  //It allows to call multiple update over the writer
 +  //It allows calling multiple update over the writer
    m_ShiftOutputIndex.Fill(0);
  }
-
+ 
 --- otb.orig/Modules/Learning/DempsterShafer/include/otbMassOfBelief.h
 +++ otb/Modules/Learning/DempsterShafer/include/otbMassOfBelief.h
 @@ -57,20 +57,20 @@
@@ -2517,7 +2517,7 @@ Last-Update: 2015-12-22
    app->SetParameterDescription(key,
 -                               "This group of parameters allows to manage elevation values. Supported formats are SRTM, DTED or any geotiff. DownloadSRTMTiles application could be a useful tool to list/download tiles related to a product.");
 +                               "This group of parameters allows managing elevation values. Supported formats are SRTM, DTED or any geotiff. DownloadSRTMTiles application could be a useful tool to list/download tiles related to a product.");
-
+ 
    // DEM directory
    std::ostringstream oss;
    oss << key<<".dem";
@@ -2526,7 +2526,7 @@ Last-Update: 2015-12-22
 -                               "This parameter allows to select a directory containing Digital Elevation Model tiles");
 +                               "This parameter allows selecting a directory containing Digital Elevation Model tiles");
    app->MandatoryOff(oss.str());
-
+ 
    std::string demDirFromConfig = otb::ConfigurationManager::GetDEMDirectory();
 @@ -73,7 +73,7 @@
    oss.str("");
@@ -2535,47 +2535,47 @@ Last-Update: 2015-12-22
 -  app->SetParameterDescription(oss.str(),"This parameter allows to set the default height above ellipsoid when there is no DEM available, no coverage for some points or pixels with no_data in the DEM tiles, and no geoid file has been set. This is also used by some application as an average elevation value.");
 +  app->SetParameterDescription(oss.str(),"This parameter allows setting the default height above ellipsoid when there is no DEM available, no coverage for some points or pixels with no_data in the DEM tiles, and no geoid file has been set. This is also used by some application as an average elevation value.");
    app->SetDefaultParameterFloat(oss.str(), 0.);
-
+ 
   // TODO : not implemented yet
 --- otb.orig/Modules/Wrappers/ApplicationEngine/src/otbWrapperMapProjectionParametersHandler.cxx
 +++ otb/Modules/Wrappers/ApplicationEngine/src/otbWrapperMapProjectionParametersHandler.cxx
 @@ -41,7 +41,7 @@
-
+ 
    oss << ".zone";
    app->AddParameter(ParameterType_Int, oss.str(), "Zone number");
 -  app->SetParameterDescription(oss.str(),"The zone number ranges from 1 to 60 and allows to define the transverse mercator projection (along with the hemisphere)");
 +  app->SetParameterDescription(oss.str(),"The zone number ranges from 1 to 60 and allows defining the transverse mercator projection (along with the hemisphere)");
    app->SetMinimumParameterIntValue(oss.str(), 1);
    app->SetDefaultParameterInt(oss.str(), 31);
-
+ 
 @@ -99,7 +99,7 @@
    oss<<key<<".epsg";
    app->AddChoice(oss.str(),"EPSG Code");
    app->SetParameterDescription(oss.str(),
 -                               "This code is a generic way of identifying map projections, and allows to specify a large amount of them. See www.spatialreference.org to find which EPSG code is associated to your projection;");
 +                               "This code is a generic way of identifying map projections, and allows specifying a large amount of them. See www.spatialreference.org to find which EPSG code is associated to your projection;");
-
+ 
    oss <<".code";
    app->AddParameter(ParameterType_Int, oss.str(), "EPSG Code");
 --- otb.orig/RELEASE_NOTES.txt
 +++ otb/RELEASE_NOTES.txt
 @@ -118,7 +118,7 @@
-
+ 
    * 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)
-
+   
 @@ -169,7 +169,7 @@
      * 0001037: file and vector outputs need explicit relative paths
      * 0001036: TileFusion application crashes with SPOT-7 tiled images
      * 0000728: Inconsistent polygon number in concatenate vector data output
 -    * 0001031: Wrong projection for ouput vector of segmentation application
 +    * 0001031: Wrong projection for output vector of segmentation application
-
-
+ 
+ 
  OTB-v.4.4.0 - Changes since version 4.2.1 (2015/02/13)
 @@ -481,13 +481,13 @@
      * 0000770: Output parameter does not appear anymore in the command line helper
@@ -2614,35 +2614,35 @@ Last-Update: 2015-12-22
 @@ -2017,7 +2017,7 @@
  OTB-v.2.4.0 - Changes since version 2.2.0 (2008/07/24)
  --------------------------------------------------------
-
+ 
 -    - Added OTB_DISABLE_CXX_EXAMPLES_TESTING : allows to generate or
 +    - Added OTB_DISABLE_CXX_EXAMPLES_TESTING : allows generating or
        not only examples testing
      - Added OTB_USE_JPEG2000 : experimental support for jpeg2000
        files.
 @@ -2354,7 +2354,7 @@
-
+ 
      - Added a new tiling streaming mode.
-
+ 
 -    - Added the otb::ImageGeometryHandler, which allows to handle
 +    - Added the otb::ImageGeometryHandler, which allows handling
        seamlessly
        the image geometry information.
-
+ 
 @@ -2438,16 +2438,16 @@
-
+ 
  *Applications:
-
+ 
 -    - Added the otbImageViewerManager application which allows to
 -      open multiple images,
 +    - Added the otbImageViewerManager application which allows
 +      opening multiple images,
        configure viewers and link displays.
-
+ 
      - Added the otbRoadExtraction which demonstrates the road
        extraction algorithm
        implemented in the FeatureExtraction module.
-
+ 
 -    - Added the otbOrthoRectifAppli application which allows to
 -      ortho rectify images in
 +    - Added the otbOrthoRectifAppli application which allows
@@ -2654,24 +2654,24 @@ Last-Update: 2015-12-22
 +++ otb/Utilities/Doxygen/OTB/ImageSimilarityMetrics.dox
 @@ -37,7 +37,7 @@
  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:
-
+ 
  \li <b> Mean Squares </b> Sum of squared differences between intensity values. It requires the two objects to have intensity values in the same range.
 -\li <b> Normalized Correlation </b> Correlation between intensity values divided by the square rooted autocorrelation of both target and reference objects: \f$ \frac{\sum_i^n{a_i * b_i }}{\sum_i^n{a_i^2}\sum_i^n{b_i^2}} \f$. This metric allows to register objects whose intensity values are related by a linear transformation.
 +\li <b> Normalized Correlation </b> Correlation between intensity values divided by the square rooted autocorrelation of both target and reference objects: \f$ \frac{\sum_i^n{a_i * b_i }}{\sum_i^n{a_i^2}\sum_i^n{b_i^2}} \f$. This metric allows registering objects whose intensity values are related by a linear transformation.
  \li <b> Pattern Intensity </b> Squared differences between intensity values transformed by a function of type  \f$ \frac{1}{1+x} \f$  and summed them up. This metric has the advantage of increase simultaneously when more samples are available and when intensity values are close.
  \li <b> Mutual Information </b> Mutual information is based in an information theory concept. Mutual information between two sets measures how much can be known from one set if only the other set is known. Given a set of values \f$ A=\{a_i\} \f$. Its entropy \f$ H(A) \f$  is defined by \f$ H(A) = \sum_i^n{- p(a_i) \log({p(a_i)})} \f$ where \f$ p(a_i) \f$ are the probabilities of the values in the set.  Entropy can be interpreted as a measure of the mean uncertainty reduction that is obt [...]
-
+ 
 --- otb.orig/Utilities/Doxygen/OTB/Registration.dox
 +++ otb/Utilities/Doxygen/OTB/Registration.dox
 @@ -75,7 +75,7 @@
  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:
-
+ 
  \li <b> Mean Squares </b> Sum of squared differences between intensity values. It requires the two objects to have intensity values in the same range.
 -\li <b> Normalized Correlation </b> Correlation between intensity values divided by the square rooted autocorrelation of both target and reference objects: \f$ \frac{\sum_i^n{a_i * b_i }}{\sum_i^n{a_i^2}\sum_i^n{b_i^2}} \f$. This metric allows to register objects whose intensity values are related by a linear transformation.
 +\li <b> Normalized Correlation </b> Correlation between intensity values divided by the square rooted autocorrelation of both target and reference objects: \f$ \frac{\sum_i^n{a_i * b_i }}{\sum_i^n{a_i^2}\sum_i^n{b_i^2}} \f$. This metric allows registering objects whose intensity values are related by a linear transformation.
  \li <b> Pattern Intensity </b> Squared differences between intensity values transformed by a function of type  \f$ \frac{1}{1+x} \f$  and summed them up. This metric has the advantage of increase simultaneously when more samples are available and when intensity values are close.
  \li <b> Mutual Information </b> Mutual information is based in an information theory concept. Mutual information between two sets measures how much can be known from one set if only the other set is known. Given a set of values \f$ A=\{a_i\} \f$. Its entropy \f$ H(A) \f$  is defined by \f$ H(A) = \sum_i^n{- p(a_i) \log({p(a_i)})} \f$ where \f$ p(a_i) \f$ are the probabilities of the values in the set.  Entropy can be interpreted as a measure of the mean uncertainty reduction that is obt [...]
-
+ 
 --- otb.orig/Examples/Projections/GeometriesProjectionExample.cxx
 +++ otb/Examples/Projections/GeometriesProjectionExample.cxx
 @@ -140,7 +140,7 @@
@@ -2699,7 +2699,7 @@ Last-Update: 2015-12-22
 @@ -81,7 +81,7 @@
    spacing[0] = 0.6;
    spacing[1] = -0.6;
-
+ 
 -  // Build the ouput projection ref : UTM ref
 +  // Build the output projection ref : UTM ref
    OGRSpatialReference    oSRS;
@@ -2755,7 +2755,7 @@ Last-Update: 2015-12-22
  typedef MorphologicalProfilesSegmentationFilter Self;
 -typedef itk::ImageToImageFilter<TInputImage, TOuputImage> Superclass;
 +typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
-
+ 
  typedef itk::SmartPointer<Self>       Pointer;
  typedef itk::SmartPointer<const Self> ConstPointer;
 @@ -69,7 +69,7 @@
@@ -2765,14 +2765,14 @@ Last-Update: 2015-12-22
 -typedef TOuputImage                        OutputImageType;
 +typedef TOutputImage                       OutputImageType;
  typedef otb::Image<TInternalPrecision>     InternalImageType;
-
+ 
  typedef TStructuringElement                StructuringElementType;
 --- otb.orig/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.txx
 +++ otb/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.txx
 @@ -23,8 +23,8 @@
  namespace otb
  {
-
+ 
 -template <class TInputImage,  class TOuputImage, class TInternalPrecision, class TStructuringElement>
 -MorphologicalProfilesSegmentationFilter<TInputImage,TOuputImage,TInternalPrecision,TStructuringElement>
 +template <class TInputImage,  class TOutputImage, class TInternalPrecision, class TStructuringElement>
@@ -2781,16 +2781,16 @@ Last-Update: 2015-12-22
  {
    m_ProfileSize = 5;
 @@ -54,14 +54,14 @@
-
+ 
  }
-
+ 
 -template <class TInputImage,  class TOuputImage, class TInternalPrecision, class TStructuringElement>
 -MorphologicalProfilesSegmentationFilter<TInputImage,TOuputImage,TInternalPrecision,TStructuringElement>
 +template <class TInputImage,  class TOutputImage, class TInternalPrecision, class TStructuringElement>
 +MorphologicalProfilesSegmentationFilter<TInputImage,TOutputImage,TInternalPrecision,TStructuringElement>
  ::~MorphologicalProfilesSegmentationFilter()
  {}
-
+ 
 -template <class TInputImage,  class TOuputImage, class TInternalPrecision, class TStructuringElement>
 +template <class TInputImage,  class TOutputImage, class TInternalPrecision, class TStructuringElement>
  void
@@ -2803,11 +2803,11 @@ Last-Update: 2015-12-22
 +++ otb/Modules/Wrappers/CommandLine/src/CMakeLists.txt
 @@ -16,7 +16,7 @@
  otb_module_target(otbApplicationLauncherCommandLine)
-
+ 
  # Where we will install the script in the build tree
 -get_target_property(CLI_OUPUT_DIR otbApplicationLauncherCommandLine RUNTIME_OUTPUT_DIRECTORY)
 +get_target_property(CLI_OUTPUT_DIR otbApplicationLauncherCommandLine RUNTIME_OUTPUT_DIRECTORY)
-
+ 
  # Generate a script in the build dir, next to the cli launcher
  # Need a two-step process since configure_file don't support permissions
 @@ -27,11 +27,11 @@
@@ -2817,13 +2817,13 @@ Last-Update: 2015-12-22
 -     DESTINATION ${CLI_OUPUT_DIR}
 +     DESTINATION ${CLI_OUTPUT_DIR}
       FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-
+ 
  # TODO : test if NO_INSTALL is set
 -install(PROGRAMS ${CLI_OUPUT_DIR}/otbcli.bat
 +install(PROGRAMS ${CLI_OUTPUT_DIR}/otbcli.bat
          DESTINATION ${OTBCommandLine_INSTALL_RUNTIME_DIR}
          COMPONENT Runtime)
-
+ 
 @@ -40,11 +40,11 @@
                  ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/otbcli
                  @ONLY )
@@ -2831,22 +2831,22 @@ Last-Update: 2015-12-22
 -     DESTINATION ${CLI_OUPUT_DIR}
 +     DESTINATION ${CLI_OUTPUT_DIR}
       FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-
+ 
  # TODO : test if NO_INSTALL is set
 -install(PROGRAMS ${CLI_OUPUT_DIR}/otbcli
 +install(PROGRAMS ${CLI_OUTPUT_DIR}/otbcli
          DESTINATION ${OTBCommandLine_INSTALL_RUNTIME_DIR}
          COMPONENT Runtime)
-
+ 
 --- otb.orig/Modules/Wrappers/QtWidget/src/CMakeLists.txt
 +++ otb/Modules/Wrappers/QtWidget/src/CMakeLists.txt
 @@ -91,7 +91,7 @@
  otb_module_target(otbApplicationLauncherQt)
-
+ 
  # Where we will install the script in the build tree
 -get_target_property(GUI_OUPUT_DIR otbApplicationLauncherQt RUNTIME_OUTPUT_DIRECTORY)
 +get_target_property(GUI_OUTPUT_DIR otbApplicationLauncherQt RUNTIME_OUTPUT_DIRECTORY)
-
+ 
  # Generate a script in the build dir, next to the gui launcher
  # Need a two-step process since configure_file don't support permissions
 @@ -103,11 +103,11 @@
@@ -2856,13 +2856,13 @@ Last-Update: 2015-12-22
 -     DESTINATION ${GUI_OUPUT_DIR}
 +     DESTINATION ${GUI_OUTPUT_DIR}
       FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-
+ 
  # TODO : test if NO_INSTALL is set
 -install(PROGRAMS ${GUI_OUPUT_DIR}/otbgui.bat
 +install(PROGRAMS ${GUI_OUTPUT_DIR}/otbgui.bat
          DESTINATION ${OTBQtWidget_INSTALL_RUNTIME_DIR}
          COMPONENT Runtime)
-
+ 
 @@ -116,11 +116,11 @@
                  ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/otbgui
                  @ONLY )
@@ -2870,13 +2870,13 @@ Last-Update: 2015-12-22
 -     DESTINATION ${GUI_OUPUT_DIR}
 +     DESTINATION ${GUI_OUTPUT_DIR}
       FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-
+ 
  # TODO : test if NO_INSTALL is set
 -install(PROGRAMS ${GUI_OUPUT_DIR}/otbgui
 +install(PROGRAMS ${GUI_OUTPUT_DIR}/otbgui
          DESTINATION ${OTBQtWidget_INSTALL_RUNTIME_DIR}
          COMPONENT Runtime)
-
+ 
 --- otb.orig/Modules/Detection/RoadExtraction/include/otbRemoveWrongDirectionFilter.h
 +++ otb/Modules/Detection/RoadExtraction/include/otbRemoveWrongDirectionFilter.h
 @@ -63,7 +63,7 @@
@@ -2913,7 +2913,7 @@ Last-Update: 2015-12-22
 --- otb.orig/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.txx
 +++ otb/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.txx
 @@ -307,7 +307,7 @@
-
+ 
    // Calculation of the four constants A, B, C and K
    MassType A = 0, B = 1, C = 1, K;
 -  K = 0; //supress warning. not sure about default value ??
@@ -2924,18 +2924,18 @@ Last-Update: 2015-12-22
 --- otb.orig/Modules/Wrappers/ApplicationEngine/src/otbWrapperDocExampleStructure.cxx
 +++ otb/Modules/Wrappers/ApplicationEngine/src/otbWrapperDocExampleStructure.cxx
 @@ -145,7 +145,7 @@
-
+ 
    res = oss.str();
-
+ 
 -  // Supress last added space
 +  // Suppress last added space
    res.erase( res.size()-1, 1);
-
+ 
    return res.c_str();
 --- otb.orig/Modules/Wrappers/CommandLine/src/otbWrapperCommandLineParser.cxx
 +++ otb/Modules/Wrappers/CommandLine/src/otbWrapperCommandLineParser.cxx
 @@ -496,7 +496,7 @@
-
+ 
    while( found != std::string::npos )
      {
 -    // Supress everything before the key
@@ -2953,7 +2953,7 @@ Last-Update: 2015-12-22
 +  virtual void SuppressFile();
    virtual void EraseFile();
    virtual void UpdateFilenameList();
-
+ 
 --- otb.orig/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputImageListParameter.h
 +++ otb/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputImageListParameter.h
 @@ -51,7 +51,7 @@
@@ -2964,7 +2964,7 @@ Last-Update: 2015-12-22
 +  virtual void SuppressFile();
    virtual void EraseFile();
    virtual void UpdateImageList();
-
+ 
 --- otb.orig/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputVectorDataListParameter.h
 +++ otb/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputVectorDataListParameter.h
 @@ -52,7 +52,7 @@
@@ -2975,7 +2975,7 @@ Last-Update: 2015-12-22
 +  virtual void SuppressFile();
    virtual void EraseFile();
    virtual void UpdateVectorDataList();
-
+ 
 --- otb.orig/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetStringListParameter.h
 +++ otb/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetStringListParameter.h
 @@ -46,7 +46,7 @@
@@ -2985,14 +2985,14 @@ Last-Update: 2015-12-22
 -  virtual void SupressString();
 +  virtual void SuppressString();
    virtual void UpdateStringList();
-
+ 
  private:
 --- otb.orig/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetInputFilenameListParameter.cxx
 +++ otb/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetInputFilenameListParameter.cxx
 @@ -87,12 +87,12 @@
    connect(addButton, SIGNAL(clicked()), this, SLOT(AddFile()));
    addSupLayout->addWidget(addButton);
-
+ 
 -  // Supress file button
 +  // Suppress file button
    QPushButton * supButton = new QPushButton;
@@ -3004,10 +3004,10 @@ Last-Update: 2015-12-22
 +  connect(supButton, SIGNAL(clicked()), this, SLOT(SuppressFile()));
    addSupLayout->addWidget(supButton);
    buttonLayout->addLayout(addSupLayout);
-
+ 
 @@ -312,7 +312,7 @@
  }
-
+ 
  void
 -QtWidgetInputFilenameListParameter::SupressFile()
 +QtWidgetInputFilenameListParameter::SuppressFile()
@@ -3019,7 +3019,7 @@ Last-Update: 2015-12-22
 @@ -89,12 +89,12 @@
    connect(addButton, SIGNAL(clicked()), this, SLOT(AddFile()));
    addSupLayout->addWidget(addButton);
-
+ 
 -  // Supress file button
 +  // Suppress file button
    QPushButton * supButton = new QPushButton;
@@ -3031,10 +3031,10 @@ Last-Update: 2015-12-22
 +  connect(supButton, SIGNAL(clicked()), this, SLOT(SuppressFile()));
    addSupLayout->addWidget(supButton);
    buttonLayout->addLayout(addSupLayout);
-
+ 
 @@ -332,7 +332,7 @@
  }
-
+ 
  void
 -QtWidgetInputImageListParameter::SupressFile()
 +QtWidgetInputImageListParameter::SuppressFile()
@@ -3046,7 +3046,7 @@ Last-Update: 2015-12-22
 @@ -86,12 +86,12 @@
    connect(addButton, SIGNAL(clicked()), this, SLOT(AddFile()));
    addSupLayout->addWidget(addButton);
-
+ 
 -  // Supress file button
 +  // Suppress file button
    QPushButton * supButton = new QPushButton;
@@ -3058,10 +3058,10 @@ Last-Update: 2015-12-22
 +  connect(supButton, SIGNAL(clicked()), this, SLOT(SuppressFile()));
    addSupLayout->addWidget(supButton);
    buttonLayout->addLayout(addSupLayout);
-
+ 
 @@ -311,7 +311,7 @@
  }
-
+ 
  void
 -QtWidgetInputVectorDataListParameter::SupressFile()
 +QtWidgetInputVectorDataListParameter::SuppressFile()
@@ -3073,7 +3073,7 @@ Last-Update: 2015-12-22
 @@ -88,12 +88,12 @@
      connect( addButton, SIGNAL(clicked()), this, SLOT(AddString()) );
      addSupLayout->addWidget(addButton);
-
+ 
 -    // Supress file button
 +    // Suppress file button
      QPushButton * supButton = new QPushButton;
@@ -3085,10 +3085,10 @@ Last-Update: 2015-12-22
 +    connect( supButton, SIGNAL(clicked()), this, SLOT(SuppressString()) );
      addSupLayout->addWidget(supButton);
      buttonLayout->addLayout(addSupLayout);
-
+ 
 @@ -177,7 +177,7 @@
-
-
+ 
+ 
  void
 -QtWidgetStringListParameter::SupressString()
 +QtWidgetStringListParameter::SuppressString()
@@ -3098,7 +3098,7 @@ Last-Update: 2015-12-22
 --- otb.orig/Modules/Applications/AppClassification/app/otbTrainRegression.cxx
 +++ otb/Modules/Applications/AppClassification/app/otbTrainRegression.cxx
 @@ -122,7 +122,7 @@
-
+ 
    //Group IO
    AddParameter(ParameterType_Group, "io", "Input and output data");
 -  SetParameterDescription("io", "This group of parameters allows to set input and output data.");
@@ -3112,7 +3112,7 @@ Last-Update: 2015-12-22
    SetParameterDescription("sample",
 -                          "This group of parameters allows to set training and validation sample lists parameters.");
 +                          "This group of parameters allows setting training and validation sample lists parameters.");
-
+ 
    AddParameter(ParameterType_Int, "sample.mt", "Maximum training predictors");
    //MandatoryOff("mt");
 @@ -230,7 +230,7 @@
@@ -3128,7 +3128,7 @@ Last-Update: 2015-12-22
 +++ otb/Modules/Applications/AppClassification/app/otbPredictRegression.cxx
 @@ -141,7 +141,7 @@
      // TODO : use CSV input/output ?
-
+ 
      AddParameter(ParameterType_InputImage,  "mask",   "Input Mask");
 -    SetParameterDescription( "mask", "The mask allows to restrict "
 +    SetParameterDescription( "mask", "The mask allow restricting "
@@ -3147,7 +3147,7 @@ Last-Update: 2015-12-22
      "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. "
 @@ -128,7 +128,7 @@
-
+ 
    //Group IO
    AddParameter(ParameterType_Group, "io", "Input and output data");
 -  SetParameterDescription("io", "This group of parameters allows to set input and output data.");
@@ -3161,7 +3161,7 @@ Last-Update: 2015-12-22
    SetParameterDescription("sample",
 -                          "This group of parameters allows to set training and validation sample lists parameters.");
 +                          "This group of parameters allows setting training and validation sample lists parameters.");
-
+ 
    AddParameter(ParameterType_Int, "sample.mt", "Maximum training sample size per class");
    //MandatoryOff("mt");
 --- otb.orig/Modules/Applications/AppImageUtils/app/otbManageNoData.cxx
@@ -3178,7 +3178,7 @@ Last-Update: 2015-12-22
 --- otb.orig/Modules/Applications/AppSARCalibration/app/otbSarRadiometricCalibration.cxx
 +++ otb/Modules/Applications/AppSARCalibration/app/otbSarRadiometricCalibration.cxx
 @@ -49,7 +49,7 @@
-
+ 
      // Documentation
      SetDocName("SAR Radiometric calibration");
 -    SetDocLongDescription("The objective of SAR calibration is to provide imagery in which the pixel values can be directly related to the radar backscatter of the scene. This application allows to compute Sigma Naught (Radiometric Calibration) for TerraSAR-X, Sentinel1 L1 and Radarsat-2 sensors. Metadata are automatically retrieved from image products.The application supports complex and non-complex images (SLC or detected products).\n");
@@ -3190,10 +3190,10 @@ Last-Update: 2015-12-22
 +++ otb/Modules/Applications/AppSARDecompositions/app/otbSARDecompositions.cxx
 @@ -111,7 +111,7 @@
      SetParameterDescription("decomp.haa","H-alpha-A decomposition");
-
+     
      AddParameter(ParameterType_Group,"inco","Incoherent decompositions");
 -    SetParameterDescription("inco","This group allows to set parameters related to the incoherent decompositions.");
 +    SetParameterDescription("inco","This group allows setting parameters related to the incoherent decompositions.");
-
+     
      AddParameter(ParameterType_Int, "inco.kernelsize",   "Kernel size for spatial incoherent averaging.");
      SetParameterDescription("inco.kernelsize", "Minute (0-59)");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.git



More information about the Pkg-grass-devel mailing list