[otb] 08/08: Update spelling patch to fix additional issues, refresh other patches.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Thu Dec 24 18:08:40 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository otb.
commit 3d78928f2573b27b8e13943ced796a111870a8ff
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Dec 24 18:31:09 2015 +0100
Update spelling patch to fix additional issues, refresh other patches.
---
debian/patches/cmake-fixes.patch | 16 +-
debian/patches/itk-modules-list.patch | 6 +-
debian/patches/spelling.patch | 1953 ++++++++++++++++++++++-----------
3 files changed, 1314 insertions(+), 661 deletions(-)
diff --git a/debian/patches/cmake-fixes.patch b/debian/patches/cmake-fixes.patch
index e098b9c..3e1af80 100644
--- a/debian/patches/cmake-fixes.patch
+++ b/debian/patches/cmake-fixes.patch
@@ -2,12 +2,12 @@ Description: Fix dh_shlibs reports missing symbols
Author: Rashad Kanavath <rashad.kanavath at c-s.fr>
Last-Update: 2015-12-22
---- otb.orig/CMake/FindOssim.cmake
-+++ otb/CMake/FindOssim.cmake
-@@ -28,21 +28,8 @@
+--- a/CMake/FindOssim.cmake
++++ b/CMake/FindOssim.cmake
+@@ -28,21 +28,8 @@ else()
endif()
endif()
-
+
-# Parse a certain header to check if SVN revision is 23537
-if(EXISTS "${OSSIM_INCLUDE_DIR}/ossim/imaging/ossimImageRenderer.h")
- file(STRINGS "${OSSIM_INCLUDE_DIR}/ossim/imaging/ossimImageRenderer.h" _ossim_image_renderer_h_CONTENTS REGEX "^// \\$Id: ossimImageRenderer\\.h [0-9.]+ ")
@@ -26,12 +26,12 @@ Last-Update: 2015-12-22
+if(NOT EXISTS "${OSSIM_INCLUDE_DIR}/ossim/base/ossimObject.h")
+ message(WARNING "ossimObject.h not found !")
endif()
-
+
find_library(OSSIM_LIBRARY
-@@ -55,5 +42,5 @@
-
+@@ -55,5 +42,5 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS( Ossim
+
mark_as_advanced( OSSIM_INCLUDE_DIR OSSIM_LIBRARY )
-
+
-set(OSSIM_LIBRARIES ${OSSIM_LIBRARY})
+set(OSSIM_LIBRARIES "${OSSIM_LIBRARY};${OPENTHREADS_LIBRARY}")
set(OSSIM_INCLUDE_DIRS ${OSSIM_INCLUDE_DIR})
diff --git a/debian/patches/itk-modules-list.patch b/debian/patches/itk-modules-list.patch
index dc76c17..b9bbad4 100644
--- a/debian/patches/itk-modules-list.patch
+++ b/debian/patches/itk-modules-list.patch
@@ -2,9 +2,9 @@ Description: Fix find_package(ITK) with only required COMPONENTS list
Author: Rashad Kanavath <rashad.kanavath at c-s.fr>
Last-Update: 2015-12-22
---- otb.orig/Modules/ThirdParty/ITK/CMakeLists.txt
-+++ otb/Modules/ThirdParty/ITK/CMakeLists.txt
-@@ -2,7 +2,80 @@
+--- a/Modules/ThirdParty/ITK/CMakeLists.txt
++++ b/Modules/ThirdParty/ITK/CMakeLists.txt
+@@ -2,7 +2,80 @@ project(OTBITK)
set(OTBITK_SYSTEM_INCLUDE_DIRS ${ITK_INCLUDE_DIRS})
set(OTBITK_LIBRARIES "${ITK_LIBRARIES}")
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
index 3ae4c82..89d320a 100644
--- a/debian/patches/spelling.patch
+++ b/debian/patches/spelling.patch
@@ -4,20 +4,23 @@ Author: Rashad Kanavath <rashad.kanavath at c-s.fr>
Author: Bas Couwenberg <sebastic at xs4all.nl>
Last-Update: 2015-12-22
---- otb.orig/Modules/Applications/AppChangeDetection/app/otbMultivariateAlterationDetector.cxx
-+++ otb/Modules/Applications/AppChangeDetection/app/otbMultivariateAlterationDetector.cxx
-@@ -75,7 +75,7 @@
+--- a/Modules/Applications/AppChangeDetection/app/otbMultivariateAlterationDetector.cxx
++++ b/Modules/Applications/AppChangeDetection/app/otbMultivariateAlterationDetector.cxx
+@@ -73,9 +73,9 @@ private:
+ " are sorted by increasing correlation. If number of bands is "
+ " different, the change maps are sorted by decreasing correlation. \n"
" \n"
- " The GetV1() and GetV2() methods allow to retrieve the linear "
+- " The GetV1() and GetV2() methods allow to retrieve the linear "
++ " The GetV1() and GetV2() methods allow retrieving the linear "
" combinations used to generate the Mad change maps as a vnl_matrix of "
- " double, and the GetRho() method allows to retrieve the correlation "
+ " double, and the GetRho() method allows one to retrieve the correlation "
" associated to each Mad change maps as a vnl_vector. \n"
" \n"
" This filter has been implemented from the Matlab code kindly made "
---- otb.orig/Modules/Applications/AppClassification/app/otbClassificationMapRegularization.cxx
-+++ otb/Modules/Applications/AppClassification/app/otbClassificationMapRegularization.cxx
-@@ -71,7 +71,7 @@
+--- a/Modules/Applications/AppClassification/app/otbClassificationMapRegularization.cxx
++++ b/Modules/Applications/AppClassification/app/otbClassificationMapRegularization.cxx
+@@ -71,7 +71,7 @@ private:
/** GROUP IO CLASSIFICATION */
AddParameter(ParameterType_Group,"io","Input and output images");
@@ -26,7 +29,7 @@ Last-Update: 2015-12-22
AddParameter(ParameterType_InputImage, "io.in", "Input classification image");
SetParameterDescription( "io.in", "The input labeled image to regularize.");
-@@ -82,7 +82,7 @@
+@@ -82,7 +82,7 @@ private:
AddParameter(ParameterType_Group,"ip","Regularization parameters");
@@ -35,9 +38,9 @@ Last-Update: 2015-12-22
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
-+++ otb/Modules/Applications/AppClassification/app/otbFusionOfClassifications.cxx
-@@ -95,7 +95,7 @@
+--- a/Modules/Applications/AppClassification/app/otbFusionOfClassifications.cxx
++++ b/Modules/Applications/AppClassification/app/otbFusionOfClassifications.cxx
+@@ -95,7 +95,7 @@ private:
SetName("FusionOfClassifications");
SetDescription("Fuses several classifications maps of the same image on the basis of class labels.");
SetDocName("Fusion of Classifications");
@@ -46,7 +49,7 @@ Last-Update: 2015-12-22
"Fusion is done either by mean of Majority Voting, or with the Dempster Shafer combination method on class labels.\n "
"-MAJORITY VOTING: for each pixel, the class with the highest number of votes is selected.\n "
"-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 @@
+@@ -346,7 +346,7 @@ private:
std::vector<std::string> confusionMatricesFilenameList = GetParameterStringList("method.dempstershafer.cmfl");
MassOfBeliefDefinitionMethod massOfBeliefDefMethod;
@@ -55,9 +58,9 @@ Last-Update: 2015-12-22
massOfBeliefDefMethod = ConfusionMatrixToMassOfBeliefType::PRECISION;
switch (GetParameterInt("method.dempstershafer.mob"))
{
---- otb.orig/Modules/Applications/AppClassification/app/otbImageClassifier.cxx
-+++ otb/Modules/Applications/AppClassification/app/otbImageClassifier.cxx
-@@ -81,7 +81,7 @@
+--- a/Modules/Applications/AppClassification/app/otbImageClassifier.cxx
++++ b/Modules/Applications/AppClassification/app/otbImageClassifier.cxx
+@@ -81,7 +81,7 @@ private:
SetParameterDescription( "in", "The input image to classify.");
AddParameter(ParameterType_InputImage, "mask", "Input Mask");
@@ -66,9 +69,9 @@ Last-Update: 2015-12-22
MandatoryOff("mask");
AddParameter(ParameterType_InputFilename, "model", "Model file");
---- otb.orig/Modules/Applications/AppDescriptors/app/otbHomologousPointsExtraction.cxx
-+++ otb/Modules/Applications/AppDescriptors/app/otbHomologousPointsExtraction.cxx
-@@ -81,19 +81,19 @@
+--- a/Modules/Applications/AppDescriptors/app/otbHomologousPointsExtraction.cxx
++++ b/Modules/Applications/AppDescriptors/app/otbHomologousPointsExtraction.cxx
+@@ -81,19 +81,19 @@ private:
{
SetName("HomologousPointsExtraction");
SetDocName("Homologous points extraction");
@@ -92,7 +95,16 @@ Last-Update: 2015-12-22
" It can be useful to assess the precision of a registration for instance."
" The vector file is always reprojected to EPSG:4326 to allow display in a GIS."
" This is done via reprojection or by applying the image sensor models.");
-@@ -175,7 +175,7 @@
+@@ -143,7 +143,7 @@ private:
+ SetParameterDescription("mode.full","Extract and match all keypoints, loading both images entirely into memory");
+
+ AddChoice("mode.geobins","Search keypoints in small spatial bins regularly spread accross first image");
+- SetParameterDescription("mode.geobins","This method allows to retrieve a set of tie points regulary spread accross image 1. Corresponding bins in image 2 are retrieved using sensor and geographical information if available. The first bin position takes into account the margin parameter. Bins are cropped to the largest image region shrinked by the margin parameter for both in1 and in2 images.");
++ SetParameterDescription("mode.geobins","This method allows retrieving a set of tie points regulary spread accross image 1. Corresponding bins in image 2 are retrieved using sensor and geographical information if available. The first bin position takes into account the margin parameter. Bins are cropped to the largest image region shrinked by the margin parameter for both in1 and in2 images.");
+
+ AddParameter(ParameterType_Int,"mode.geobins.binsize","Size of bin");
+ SetParameterDescription("mode.geobins.binsize","Radius of the spatial bin in pixels");
+@@ -175,7 +175,7 @@ private:
SetDefaultParameterFloat("precision",0.);
AddParameter(ParameterType_Empty,"mfilter","Filter points according to geographical or sensor based colocalisation");
@@ -101,9 +113,9 @@ Last-Update: 2015-12-22
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 @@
+--- a/Modules/Applications/AppEdge/app/otbLineSegmentDetection.cxx
++++ b/Modules/Applications/AppEdge/app/otbLineSegmentDetection.cxx
+@@ -57,7 +57,7 @@ private:
// Documentation
SetDocName("Line segment detection");
@@ -112,9 +124,9 @@ Last-Update: 2015-12-22
SetDocLimitations("None");
SetDocAuthors("OTB-Team");
SetDocSeeAlso("On Line demonstration of the LSD algorithm is available here: http://www.ipol.im/pub/algo/gjmr_line_segment_detector/\n");
---- otb.orig/Modules/Applications/AppHyperspectral/app/otbHyperspectralUnmixing.cxx
-+++ otb/Modules/Applications/AppHyperspectral/app/otbHyperspectralUnmixing.cxx
-@@ -96,7 +96,7 @@
+--- a/Modules/Applications/AppHyperspectral/app/otbHyperspectralUnmixing.cxx
++++ b/Modules/Applications/AppHyperspectral/app/otbHyperspectralUnmixing.cxx
+@@ -96,7 +96,7 @@ private:
// Documentation
SetDocName("Hyperspectral data unmixing");
@@ -123,7 +135,7 @@ Last-Update: 2015-12-22
SetDocLimitations("None");
SetDocAuthors("OTB-Team");
SetDocSeeAlso("VertexComponentAnalysis");
-@@ -128,7 +128,7 @@
+@@ -128,7 +128,7 @@ private:
SetParameterDescription("ua.isra", "Image Space Reconstruction Algorithm");
AddChoice("ua.mdmdnmf", "MDMDNMF");
@@ -132,9 +144,9 @@ Last-Update: 2015-12-22
SetParameterString("ua", "ucls");
// Doc example parameter settings
SetDocExampleParameterValue("in", "cupriteSubHsi.tif");
---- otb.orig/Modules/Applications/AppImageUtils/app/otbColorMapping.cxx
-+++ otb/Modules/Applications/AppImageUtils/app/otbColorMapping.cxx
-@@ -250,10 +250,10 @@
+--- a/Modules/Applications/AppImageUtils/app/otbColorMapping.cxx
++++ b/Modules/Applications/AppImageUtils/app/otbColorMapping.cxx
+@@ -250,10 +250,10 @@ private:
SetDescription("Maps an input label image to 8-bits RGB using look-up tables.");
SetDocName("Color Mapping");
@@ -148,9 +160,9 @@ Last-Update: 2015-12-22
"to a colored image using continuous look-up table, in order to enhance image interpretation. Several "
"look-up tables can been chosen with different color ranges.\n-The optimal method computes an optimal "
"look-up table. When processing a segmentation label image (label to color), the color difference between"
---- otb.orig/Modules/Applications/AppImageUtils/app/otbDownloadSRTMTiles.cxx
-+++ otb/Modules/Applications/AppImageUtils/app/otbDownloadSRTMTiles.cxx
-@@ -96,7 +96,7 @@
+--- a/Modules/Applications/AppImageUtils/app/otbDownloadSRTMTiles.cxx
++++ b/Modules/Applications/AppImageUtils/app/otbDownloadSRTMTiles.cxx
+@@ -96,7 +96,7 @@ private:
// Documentation
SetDocName("Download or list SRTM tiles related to a set of images");
@@ -159,9 +171,9 @@ Last-Update: 2015-12-22
SetDocLimitations("None");
SetDocAuthors("OTB-Team");
SetDocSeeAlso(" ");
---- otb.orig/Modules/Applications/AppImageUtils/app/otbMultiResolutionPyramid.cxx
-+++ otb/Modules/Applications/AppImageUtils/app/otbMultiResolutionPyramid.cxx
-@@ -95,7 +95,7 @@
+--- a/Modules/Applications/AppImageUtils/app/otbMultiResolutionPyramid.cxx
++++ b/Modules/Applications/AppImageUtils/app/otbMultiResolutionPyramid.cxx
+@@ -95,7 +95,7 @@ private:
// Boolean Fast scheme
AddParameter(ParameterType_Empty, "fast", "Use Fast Scheme");
std::ostringstream desc;
@@ -170,9 +182,18 @@ Last-Update: 2015-12-22
<<" subsampling previous level of pyramid instead of processing the full input.";
SetParameterDescription("fast", desc.str());
MandatoryOff("fast");
---- otb.orig/Modules/Applications/AppImageUtils/app/otbReadImageInfo.cxx
-+++ otb/Modules/Applications/AppImageUtils/app/otbReadImageInfo.cxx
-@@ -179,7 +179,7 @@
+--- a/Modules/Applications/AppImageUtils/app/otbReadImageInfo.cxx
++++ b/Modules/Applications/AppImageUtils/app/otbReadImageInfo.cxx
+@@ -70,7 +70,7 @@ private:
+ MandatoryOff("keywordlist");
+
+ AddParameter(ParameterType_OutputFilename, "outkwl", "Write the OSSIM keywordlist to a geom file");
+- SetParameterDescription("outkwl", "This option allows to extract the OSSIM keywordlist of the image into a geom file.");
++ SetParameterDescription("outkwl", "This option allows extracting the OSSIM keywordlist of the image into a geom file.");
+ MandatoryOff("outkwl");
+
+ //Create output parameters to store image informations
+@@ -179,7 +179,7 @@ private:
EnableParameter("country");
AddParameter(ParameterType_Group, "rgb", "Default RGB Display");
@@ -181,7 +202,16 @@ Last-Update: 2015-12-22
AddParameter(ParameterType_Int, "rgb.r", "Red Band");
SetParameterDescription("rgb.r","Red band Number");
-@@ -491,7 +491,7 @@
+@@ -207,7 +207,7 @@ private:
+ EnableParameter("keyword");
+
+ AddParameter(ParameterType_Group, "gcp", "Ground Control Points information");
+- SetParameterDescription("gcp","This group of parameters allows to access to the GCPs information.");
++ SetParameterDescription("gcp","This group of parameters allows accessing the GCPs information.");
+ SetParameterRole("gcp", Role_Output);
+
+ AddParameter(ParameterType_Int, "gcp.count", "GCPs Number");
+@@ -491,7 +491,7 @@ private:
ossOutput << "\t" << GetParameterString("keyword") << std::endl;
}
@@ -190,9 +220,9 @@ Last-Update: 2015-12-22
otbAppLogINFO( << ossOutput.str() );
if(IsParameterEnabled("outkwl"))
---- otb.orig/Modules/Applications/AppMathParserX/app/otbBandMathX.cxx
-+++ otb/Modules/Applications/AppMathParserX/app/otbBandMathX.cxx
-@@ -108,7 +108,7 @@
+--- a/Modules/Applications/AppMathParserX/app/otbBandMathX.cxx
++++ b/Modules/Applications/AppMathParserX/app/otbBandMathX.cxx
+@@ -108,7 +108,7 @@ private:
"matrices (for instance cos, sin, ...). These new operators/ functions keep the original names to which we added the prefix 'v' for vector (vcos, vsin, ...).\n"
"- mult, div and pow operators, that perform element-wise multiplication, division or exponentiation of vector/matrices (for instance im1 div im2)\n"
"- mlt, dv and pw operators, that perform multiplication, division or exponentiation of vector/matrices by a scalar (for instance im1 dv 2.0)\n"
@@ -201,7 +231,7 @@ Last-Update: 2015-12-22
"for instance bands(im1,{1,2,1,1}) produces a vector of 4 components made of band 1, band 2, band 1 and band 1 values from the first input.\n"
"Note that curly brackets must be used in order to select the desired band indices.\n"
"... and so on.\n"
-@@ -126,7 +126,7 @@
+@@ -126,7 +126,7 @@ private:
"In the latter case, elements of a row must be separated by commas, and rows must be separated by semicolons.\n"
"It is also possible to define expressions within the same txt file, with the pattern #E expr. For instance (two expressions; see also limitations section below):\n\n"
"#E $dotpr(kernel1,im1b1N3x5); im2b1^expo$\n"
@@ -210,15 +240,15 @@ Last-Update: 2015-12-22
"- Setting the output image can be done with the 'out' parameter (multi-outputs is not implemented yet).\n"
"\n\n"
"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 @@
+@@ -234,5 +234,3 @@ private:
} // namespace otb
OTB_APPLICATION_EXPORT(otb::Wrapper::BandMathX)
-
-
---- otb.orig/Modules/Applications/AppOpticalCalibration/app/otbOpticalCalibration.cxx
-+++ otb/Modules/Applications/AppOpticalCalibration/app/otbOpticalCalibration.cxx
-@@ -124,10 +124,10 @@
+--- a/Modules/Applications/AppOpticalCalibration/app/otbOpticalCalibration.cxx
++++ b/Modules/Applications/AppOpticalCalibration/app/otbOpticalCalibration.cxx
+@@ -124,10 +124,10 @@ private:
void DoInit()
{
SetName("OpticalCalibration");
@@ -231,7 +261,7 @@ Last-Update: 2015-12-22
"\n--------------------------\n\n"
"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 @@
+@@ -198,7 +198,7 @@ private:
AddParameter(ParameterType_Empty, "milli", "Convert to milli reflectance");
SetParameterDescription("milli", "Flag to use milli-reflectance instead of reflectance.\n"
@@ -240,7 +270,7 @@ Last-Update: 2015-12-22
DisableParameter("milli");
MandatoryOff("milli");
-@@ -209,7 +209,7 @@
+@@ -209,7 +209,7 @@ private:
//Acquisition parameters
AddParameter(ParameterType_Group,"acqui","Acquisition parameters");
@@ -249,7 +279,7 @@ Last-Update: 2015-12-22
//Minute
AddParameter(ParameterType_Int, "acqui.minute", "Minute");
SetParameterDescription("acqui.minute", "Minute (0-59)");
-@@ -285,7 +285,7 @@
+@@ -285,7 +285,7 @@ private:
//Atmospheric parameters (TOC)
AddParameter(ParameterType_Group,"atmo","Atmospheric parameters (for TOC)");
@@ -258,9 +288,9 @@ Last-Update: 2015-12-22
AddParameter(ParameterType_Choice, "atmo.aerosol", "Aerosol Model");
AddChoice("atmo.aerosol.noaersol", "No Aerosol Model");
AddChoice("atmo.aerosol.continental", "Continental");
---- otb.orig/Modules/Applications/AppProjection/app/otbGenerateRPCSensorModel.cxx
-+++ otb/Modules/Applications/AppProjection/app/otbGenerateRPCSensorModel.cxx
-@@ -60,7 +60,7 @@
+--- a/Modules/Applications/AppProjection/app/otbGenerateRPCSensorModel.cxx
++++ b/Modules/Applications/AppProjection/app/otbGenerateRPCSensorModel.cxx
+@@ -60,7 +60,7 @@ private:
SetDescription("Generate a RPC sensor model from a list of Ground Control Points.");
SetDocName("Generate a RPC sensor model");
@@ -269,9 +299,9 @@ Last-Update: 2015-12-22
AddDocTag(Tags::Geometry);
---- otb.orig/Modules/Applications/AppProjection/app/otbGridBasedImageResampling.cxx
-+++ otb/Modules/Applications/AppProjection/app/otbGridBasedImageResampling.cxx
-@@ -107,7 +107,7 @@
+--- a/Modules/Applications/AppProjection/app/otbGridBasedImageResampling.cxx
++++ b/Modules/Applications/AppProjection/app/otbGridBasedImageResampling.cxx
+@@ -107,7 +107,7 @@ private:
SetDescription("Resamples an image according to a resampling grid");
SetDocName("Grid Based Image Resampling");
@@ -280,7 +310,7 @@ Last-Update: 2015-12-22
SetDocLimitations("None");
SetDocAuthors("OTB-Team");
-@@ -116,7 +116,7 @@
+@@ -116,7 +116,7 @@ private:
SetDocSeeAlso("otbStereorecificationGridGeneration");
AddParameter(ParameterType_Group,"io","Input and output data");
@@ -289,7 +319,7 @@ Last-Update: 2015-12-22
AddParameter(ParameterType_InputImage,"io.in","Input image");
SetParameterDescription("io.in","The input image to resample");
AddParameter(ParameterType_OutputImage, "io.out", "Output Image");
-@@ -126,7 +126,7 @@
+@@ -126,7 +126,7 @@ private:
AddParameter(ParameterType_InputImage,"grid.in","Input resampling grid");
SetParameterDescription("grid.in","The resampling grid");
AddParameter(ParameterType_Choice, "grid.type", "Grid Type");
@@ -298,7 +328,7 @@ Last-Update: 2015-12-22
AddChoice("grid.type.def","Displacement grid: $G(x_out,y_out) = (x_in-x_out, y_in-y_out)$");
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 @@
+@@ -161,14 +161,14 @@ private:
// Interpolators
AddParameter(ParameterType_Choice, "interpolator", "Interpolation");
@@ -315,9 +345,9 @@ Last-Update: 2015-12-22
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 @@
+--- a/Modules/Applications/AppProjection/app/otbOrthoRectification.cxx
++++ b/Modules/Applications/AppProjection/app/otbOrthoRectification.cxx
+@@ -88,7 +88,7 @@ private:
{
SetName("OrthoRectification");
std::ostringstream oss;
@@ -326,7 +356,7 @@ Last-Update: 2015-12-22
SetDescription(oss.str());
// Documentation
SetDocName("Ortho-rectification");
-@@ -106,7 +106,7 @@
+@@ -106,7 +106,7 @@ private:
// Set the parameters
AddParameter(ParameterType_Group,"io","Input and output data");
@@ -335,7 +365,7 @@ Last-Update: 2015-12-22
AddParameter(ParameterType_InputImage, "io.in", "Input Image");
SetParameterDescription("io.in","The input image to ortho-rectify");
AddParameter(ParameterType_OutputImage, "io.out", "Output Image");
-@@ -117,7 +117,7 @@
+@@ -117,7 +117,7 @@ private:
// Add the output paramters in a group
AddParameter(ParameterType_Group, "outputs", "Output Image Grid");
@@ -344,7 +374,7 @@ Last-Update: 2015-12-22
// UserDefined values
AddParameter(ParameterType_Choice, "outputs.mode", "Parameters estimation modes");
-@@ -177,7 +177,7 @@
+@@ -177,7 +177,7 @@ private:
std::ostringstream isotropOss;
isotropOss << "Default spacing (pixel size) values are estimated from the sensor modeling of the image. It can therefore result in a non-isotropic spacing. ";
isotropOss << "This option allows you to force default values to be isotropic (in this case, the minimum of spacing in both direction is applied. ";
@@ -353,7 +383,7 @@ Last-Update: 2015-12-22
SetParameterDescription("outputs.isotropic", isotropOss.str());
EnableParameter("outputs.isotropic");
-@@ -193,26 +193,26 @@
+@@ -193,26 +193,26 @@ private:
AddParameter(ParameterType_Choice, "interpolator", "Interpolation");
AddChoice("interpolator.bco", "Bicubic interpolation");
AddParameter(ParameterType_Radius, "interpolator.bco.radius", "Radius for bicubic interpolation");
@@ -385,9 +415,9 @@ Last-Update: 2015-12-22
// 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 @@
+--- a/Modules/Applications/AppProjection/app/otbRefineSensorModel.cxx
++++ b/Modules/Applications/AppProjection/app/otbRefineSensorModel.cxx
+@@ -59,7 +59,7 @@ private:
SetDescription("Perform least-square fit of a sensor model to a set of tie points");
SetDocName("Refine Sensor Model");
@@ -396,9 +426,9 @@ Last-Update: 2015-12-22
AddDocTag(Tags::Geometry);
---- otb.orig/Modules/Applications/AppProjection/app/otbRigidTransformResample.cxx
-+++ otb/Modules/Applications/AppProjection/app/otbRigidTransformResample.cxx
-@@ -100,7 +100,7 @@
+--- a/Modules/Applications/AppProjection/app/otbRigidTransformResample.cxx
++++ b/Modules/Applications/AppProjection/app/otbRigidTransformResample.cxx
+@@ -100,7 +100,7 @@ private:
//Transform
AddParameter(ParameterType_Group,"transform","Transform parameters");
@@ -407,7 +437,7 @@ Last-Update: 2015-12-22
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 @@
+@@ -148,20 +148,20 @@ private:
// Interpolators
AddParameter(ParameterType_Choice, "interpolator", "Interpolation");
@@ -431,9 +461,9 @@ Last-Update: 2015-12-22
// Doc example parameter settings
SetDocExampleParameterValue("in", "qb_toulouse_sub.tif");
---- otb.orig/Modules/Applications/AppProjection/app/otbVectorDataReprojection.cxx
-+++ otb/Modules/Applications/AppProjection/app/otbVectorDataReprojection.cxx
-@@ -61,13 +61,13 @@
+--- a/Modules/Applications/AppProjection/app/otbVectorDataReprojection.cxx
++++ b/Modules/Applications/AppProjection/app/otbVectorDataReprojection.cxx
+@@ -61,13 +61,13 @@ private:
{
SetName("VectorDataReprojection");
std::ostringstream oss;
@@ -449,9 +479,9 @@ Last-Update: 2015-12-22
", or a user given map projection." << std::endl;
oss <<" If given, image keywordlist can be added to reprojected vectordata.";
SetDocLongDescription(oss.str());
---- otb.orig/Modules/Applications/AppSegmentation/app/otbConnectedComponentSegmentation.cxx
-+++ otb/Modules/Applications/AppSegmentation/app/otbConnectedComponentSegmentation.cxx
-@@ -71,7 +71,7 @@
+--- a/Modules/Applications/AppSegmentation/app/otbConnectedComponentSegmentation.cxx
++++ b/Modules/Applications/AppSegmentation/app/otbConnectedComponentSegmentation.cxx
+@@ -71,7 +71,7 @@ private:
SetName("ConnectedComponentSegmentation");
SetDescription("Connected component segmentation and object based image filtering of the input image according to user-defined criterions.");
SetDocName("Connected Component Segmentation");
@@ -460,9 +490,9 @@ Last-Update: 2015-12-22
SetDocLimitations("Due to the tiling scheme in case of large images, some segments can be arbitrarily split across multiple tiles.");
SetDocAuthors("OTB-Team");
SetDocSeeAlso(" ");
---- otb.orig/Modules/Applications/AppSegmentation/app/otbLSMSSegmentation.cxx
-+++ otb/Modules/Applications/AppSegmentation/app/otbLSMSSegmentation.cxx
-@@ -217,7 +217,7 @@
+--- a/Modules/Applications/AppSegmentation/app/otbLSMSSegmentation.cxx
++++ b/Modules/Applications/AppSegmentation/app/otbLSMSSegmentation.cxx
+@@ -217,7 +217,7 @@ private:
SetDescription("Second step of the exact Large-Scale Mean-Shift segmentation workflow.");
SetDocName("Exact Large-Scale Mean-Shift segmentation, step 2");
@@ -471,15 +501,15 @@ Last-Update: 2015-12-22
SetDocLimitations("This application is part of the Large-Scale Mean-Shift segmentation workflow (LSMS) and may not be suited for any other purpose.");
SetDocAuthors("David Youssefi");
SetDocSeeAlso("MeanShiftSmoothing, LSMSSmallRegionsMerging, LSMSVectorization");
-@@ -713,5 +713,3 @@
+@@ -713,5 +713,3 @@ private:
}
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 @@
+--- a/Modules/Applications/AppSegmentation/app/otbSegmentation.cxx
++++ b/Modules/Applications/AppSegmentation/app/otbSegmentation.cxx
+@@ -138,7 +138,7 @@ private:
// Documentation
SetDocName("Segmentation");
@@ -488,7 +518,7 @@ Last-Update: 2015-12-22
"Available segmentation algorithms are two different versions of Mean-Shift segmentation algorithm (one being multi-threaded),"
" simple pixel based connected components according to a user-defined criterion, and watershed from the gradient of the intensity"
" (norm of spectral bands vector). The application has two different modes that affects the nature of its output.\n\nIn raster mode,"
-@@ -147,8 +147,8 @@
+@@ -147,8 +147,8 @@ private:
" can not handle large images. \n\nTo segment large data, one can use the vector mode. In this case, the output of the application is a"
" vector file or database. The input image is split into tiles (whose size can be set using the tilesize parameter), and each tile is loaded, segmented"
" with the chosen algorithm, vectorized, and written into the output file or database. This piece-wise behavior ensure that memory will never get overloaded,"
@@ -499,7 +529,7 @@ Last-Update: 2015-12-22
" 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 @@
+@@ -223,7 +223,7 @@ private:
SetParameterDescription("mode", "Choice of processing mode, either raster or large-scale.");
AddChoice("mode.vector", "Tile-based large-scale segmentation with vector output");
@@ -508,16 +538,19 @@ Last-Update: 2015-12-22
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 @@
+@@ -258,9 +258,9 @@ private:
SetParameterDescription("mode.vector.out", "The output vector file or database (name can be anything understood by OGR)");
AddParameter(ParameterType_Choice,"mode.vector.outmode","Writing mode for the output vector file");
- SetParameterDescription("mode.vector.outmode","This allows to set the writing behaviour for the output vector file. Please note that the actual behaviour depends on the file format.");
+ SetParameterDescription("mode.vector.outmode","This allows one to set the writing behaviour for the output vector file. Please note that the actual behaviour depends on the file format.");
- AddChoice("mode.vector.outmode.ulco","Update output vector file, only allow to create new layers");
+- AddChoice("mode.vector.outmode.ulco","Update output vector file, only allow to create new layers");
++ AddChoice("mode.vector.outmode.ulco","Update output vector file, only allow creating new layers");
SetParameterDescription("mode.vector.outmode.ulco","The output vector file is opened in update mode if existing. If the output layer already exists, the application stops, leaving it untouched.");
-@@ -298,7 +298,7 @@
+
+ AddChoice("mode.vector.outmode.ovw","Overwrite output vector file if existing.");
+@@ -298,7 +298,7 @@ private:
AddParameter(ParameterType_Float, "mode.vector.simplify", "Simplify polygons");
SetParameterDescription("mode.vector.simplify",
@@ -526,9 +559,9 @@ Last-Update: 2015-12-22
SetDefaultParameterFloat("mode.vector.simplify",0.1);
MandatoryOff("mode.vector.simplify");
DisableParameter("mode.vector.simplify");
---- otb.orig/Modules/Applications/AppStereo/app/otbBlockMatching.cxx
-+++ otb/Modules/Applications/AppStereo/app/otbBlockMatching.cxx
-@@ -127,11 +127,11 @@
+--- a/Modules/Applications/AppStereo/app/otbBlockMatching.cxx
++++ b/Modules/Applications/AppStereo/app/otbBlockMatching.cxx
+@@ -127,11 +127,11 @@ private:
SetDescription("Performs block-matching to estimate pixel-wise disparities between two images");
SetDocName("Pixel-wise Block-Matching");
@@ -543,7 +576,7 @@ Last-Update: 2015-12-22
"investigate disparities that will not be reliable anyway. For efficiency reasons, if the optimal metric values"
" image is desired, it will be concatenated to the output image (which will then have three bands : horizontal "
"disparity, vertical disparity and metric value). One can split these images afterward.");
-@@ -142,7 +142,7 @@
+@@ -142,7 +142,7 @@ private:
AddDocTag(Tags::Stereo);
AddParameter(ParameterType_Group,"io","Input and output data");
@@ -552,7 +585,7 @@ Last-Update: 2015-12-22
AddParameter(ParameterType_InputImage,"io.inleft","Left input image");
SetParameterDescription("io.inleft","The left input image (reference)");
-@@ -163,24 +163,24 @@
+@@ -163,30 +163,30 @@ private:
SetParameterDescription("io.outmetric","If used, the output image will have a second component with metric optimal values");
AddParameter(ParameterType_Group,"mask","Image masking parameters");
@@ -582,9 +615,16 @@ Last-Update: 2015-12-22
MandatoryOff("mask.variancet");
SetDefaultParameterFloat("mask.variancet",100.);
DisableParameter("mask.variancet");
---- otb.orig/Modules/Applications/AppStereo/app/otbDisparityMapToElevationMap.cxx
-+++ otb/Modules/Applications/AppStereo/app/otbDisparityMapToElevationMap.cxx
-@@ -76,7 +76,7 @@
+
+ AddParameter(ParameterType_Group,"bm","Block matching parameters");
+- SetParameterDescription("bm","This group of parameters allow to tune the block-matching behaviour");
++ SetParameterDescription("bm","This group of parameters allow tuning the block-matching behaviour");
+
+ AddParameter(ParameterType_Choice, "bm.metric", "Block-matching metric");
+ AddChoice("bm.metric.ssd","Sum of Squared Distances");
+--- a/Modules/Applications/AppStereo/app/otbDisparityMapToElevationMap.cxx
++++ b/Modules/Applications/AppStereo/app/otbDisparityMapToElevationMap.cxx
+@@ -76,7 +76,7 @@ private:
AddDocTag(Tags::Stereo);
AddParameter(ParameterType_Group,"io","Input and output data");
@@ -593,9 +633,9 @@ Last-Update: 2015-12-22
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 @@
+--- a/Modules/Applications/AppStereo/app/otbStereoFramework.cxx
++++ b/Modules/Applications/AppStereo/app/otbStereoFramework.cxx
+@@ -341,7 +341,7 @@ private:
// Add the output paramters in a group
AddParameter(ParameterType_Group, "input", "Input parameters");
@@ -604,7 +644,7 @@ Last-Update: 2015-12-22
AddParameter(ParameterType_InputImageList, "input.il", "Input images list");
SetParameterDescription("input.il", "The list of images.");
-@@ -362,7 +362,7 @@
+@@ -362,7 +362,7 @@ private:
// Add the output paramters in a group
AddParameter(ParameterType_Group, "output", "Output parameters");
@@ -613,7 +653,7 @@ Last-Update: 2015-12-22
// // Build the Output Map Projection
// for custom map projection
-@@ -380,7 +380,7 @@
+@@ -380,7 +380,7 @@ private:
// UserDefined values
AddParameter(ParameterType_Choice, "output.fusionmethod", "Method to fuse measures in each DSM cell");
@@ -622,7 +662,7 @@ Last-Update: 2015-12-22
AddChoice("output.fusionmethod.max", "The cell is filled with the maximum measured elevation values");
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 @@
+@@ -419,7 +419,7 @@ private:
// Add the output paramters in a group
AddParameter(ParameterType_Group, "stereorect", "Stereorectification Grid parameters");
@@ -631,7 +671,7 @@ Last-Update: 2015-12-22
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 @@
+@@ -427,13 +427,13 @@ private:
MandatoryOff("stereorect.fwdgridstep");
AddParameter(ParameterType_Int, "stereorect.invgridssrate", "Sub-sampling rate for epipolar grid inversion");
@@ -640,7 +680,14 @@ Last-Update: 2015-12-22
SetDefaultParameterInt("stereorect.invgridssrate",10);
SetMinimumParameterIntValue("stereorect.invgridssrate",1);
MandatoryOff("stereorect.invgridssrate");
-@@ -506,7 +506,7 @@
+
+ AddParameter(ParameterType_Group,"bm","Block matching parameters");
+- SetParameterDescription("bm","This group of parameters allow to tune the block-matching behavior");
++ SetParameterDescription("bm","This group of parameters allow tuning the block-matching behavior");
+
+ AddParameter(ParameterType_Choice, "bm.metric", "Block-matching metric");
+ //SetDefaultParameterInt("bm.metric",3);
+@@ -506,7 +506,7 @@ private:
DisableParameter("mask.right");
AddParameter(ParameterType_Float,"mask.variancet","Discard pixels with low local variance");
@@ -649,9 +696,9 @@ Last-Update: 2015-12-22
MandatoryOff("mask.variancet");
SetDefaultParameterFloat("mask.variancet",50.);
//DisableParameter("mask.variancet");
---- otb.orig/Modules/Applications/AppStereo/app/otbStereoRectificationGridGenerator.cxx
-+++ otb/Modules/Applications/AppStereo/app/otbStereoRectificationGridGenerator.cxx
-@@ -111,7 +111,7 @@
+--- a/Modules/Applications/AppStereo/app/otbStereoRectificationGridGenerator.cxx
++++ b/Modules/Applications/AppStereo/app/otbStereoRectificationGridGenerator.cxx
+@@ -111,7 +111,7 @@ private:
SetDocSeeAlso("otbGridBasedImageResampling");
AddParameter(ParameterType_Group,"io","Input and output data");
@@ -660,7 +707,7 @@ Last-Update: 2015-12-22
AddParameter(ParameterType_InputImage,"io.inleft","Left input image");
SetParameterDescription("io.inleft","The left input image to resample");
-@@ -155,11 +155,11 @@
+@@ -155,11 +155,11 @@ private:
DisableParameter("epi.elevation.avgdem.maxdisp");
AddParameter(ParameterType_Float,"epi.scale","Scale of epipolar images");
@@ -674,7 +721,7 @@ Last-Update: 2015-12-22
SetDefaultParameterInt("epi.step",1);
AddParameter(ParameterType_Int,"epi.rectsizex","Rectified image size X");
-@@ -175,7 +175,7 @@
+@@ -175,7 +175,7 @@ private:
SetParameterRole("epi.baseline", Role_Output);
AddParameter(ParameterType_Group,"inverse","Write inverse fields");
@@ -683,7 +730,7 @@ Last-Update: 2015-12-22
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 @@
+@@ -186,7 +186,7 @@ private:
MandatoryOff("inverse.outright");
AddParameter(ParameterType_Int, "inverse.ssrate", "Sub-sampling rate for inversion");
@@ -692,9 +739,9 @@ Last-Update: 2015-12-22
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 @@
+--- a/Modules/Applications/AppTextures/app/otbHaralickTextureExtraction.cxx
++++ b/Modules/Applications/AppTextures/app/otbHaralickTextureExtraction.cxx
+@@ -90,7 +90,7 @@ SetMinimumParameterIntValue("channel", 1
AddRAMParameter();
AddParameter(ParameterType_Group, "parameters", "Texture feature parameters");
@@ -703,9 +750,9 @@ Last-Update: 2015-12-22
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 @@
+--- a/Modules/Applications/AppTextures/app/otbSFSTextureExtraction.cxx
++++ b/Modules/Applications/AppTextures/app/otbSFSTextureExtraction.cxx
+@@ -81,7 +81,7 @@ SetMinimumParameterIntValue("channel", 1
AddRAMParameter();
AddParameter(ParameterType_Group, "parameters", "Texture feature parameters");
@@ -714,9 +761,9 @@ Last-Update: 2015-12-22
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 @@
+--- a/Modules/Applications/AppVectorDataTranslation/app/otbRasterization.cxx
++++ b/Modules/Applications/AppVectorDataTranslation/app/otbRasterization.cxx
+@@ -63,7 +63,7 @@ private:
SetDescription("Rasterize a vector dataset.");
SetDocName("Rasterization");
@@ -725,8 +772,8 @@ Last-Update: 2015-12-22
SetDocLimitations("None");
SetDocAuthors("OTB-Team");
SetDocSeeAlso("For now, support of input dataset with multiple layers having different projection reference system is limited.");
---- otb.orig/Examples/DataRepresentation/Image/VectorImage.cxx
-+++ otb/Examples/DataRepresentation/Image/VectorImage.cxx
+--- a/Examples/DataRepresentation/Image/VectorImage.cxx
++++ b/Examples/DataRepresentation/Image/VectorImage.cxx
@@ -40,7 +40,7 @@
// However, the \doxygen{itk}{Vector} is a fixed size array and it
// assumes that the number of channels of the image is known at
@@ -736,7 +783,7 @@ Last-Update: 2015-12-22
// of channels of the image at runtime. The pixels will be of type
// \doxygen{itk}{VariableLengthVector}.
//
-@@ -91,7 +91,7 @@
+@@ -91,7 +91,7 @@ int main(int, char *[])
image->SetRegions(region);
// Software Guide : BeginLatex
@@ -745,9 +792,9 @@ Last-Update: 2015-12-22
// 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 @@
+--- a/Modules/Applications/AppClassification/app/otbComputePolylineFeatureFromImage.cxx
++++ b/Modules/Applications/AppClassification/app/otbComputePolylineFeatureFromImage.cxx
+@@ -76,10 +76,10 @@ private:
void DoInit()
{
SetName("ComputePolylineFeatureFromImage");
@@ -760,9 +807,9 @@ Last-Update: 2015-12-22
SetDocLimitations("Since it does not rely on streaming process, take care of the size of input image before launching application.");
SetDocAuthors("OTB-Team");
SetDocSeeAlso(" ");
---- otb.orig/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.h
-+++ otb/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.h
-@@ -249,7 +249,7 @@
+--- a/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.h
++++ b/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.h
+@@ -249,7 +249,7 @@ private:
typename ChannelExtractorType::Pointer m_Extractor;
// Foreground mask value
FunctorFilterPointerType m_MaskFilter;
@@ -771,9 +818,9 @@ Last-Update: 2015-12-22
OutputPixelType m_ObjectColor;
// Use mask
bool m_UseMask;
---- otb.orig/Modules/Wrappers/ApplicationEngine/src/otbWrapperComplexInputImageParameter.cxx
-+++ otb/Modules/Wrappers/ApplicationEngine/src/otbWrapperComplexInputImageParameter.cxx
-@@ -42,7 +42,7 @@
+--- a/Modules/Wrappers/ApplicationEngine/src/otbWrapperComplexInputImageParameter.cxx
++++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperComplexInputImageParameter.cxx
+@@ -42,7 +42,7 @@ ComplexInputImageParameter::~ComplexInpu
bool
ComplexInputImageParameter::SetFromFileName(const std::string& filename)
{
@@ -782,9 +829,9 @@ Last-Update: 2015-12-22
this->ClearValue();
// No file existence is done here :
---- otb.orig/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageListParameter.cxx
-+++ otb/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageListParameter.cxx
-@@ -38,7 +38,7 @@
+--- a/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageListParameter.cxx
++++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageListParameter.cxx
+@@ -38,7 +38,7 @@ InputImageListParameter::~InputImageList
bool
InputImageListParameter::SetListFromFileName(const std::vector<std::string> & filenames)
{
@@ -793,9 +840,9 @@ Last-Update: 2015-12-22
this->ClearValue();
bool isOk = true;
---- otb.orig/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameter.cxx
-+++ otb/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameter.cxx
-@@ -43,7 +43,7 @@
+--- a/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameter.cxx
++++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameter.cxx
+@@ -43,7 +43,7 @@ InputImageParameter::~InputImageParamete
bool
InputImageParameter::SetFromFileName(const std::string& filename)
{
@@ -804,9 +851,9 @@ Last-Update: 2015-12-22
this->ClearValue();
// No file existence is done here :
---- otb.orig/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputVectorDataListParameter.cxx
-+++ otb/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputVectorDataListParameter.cxx
-@@ -40,7 +40,7 @@
+--- a/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputVectorDataListParameter.cxx
++++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputVectorDataListParameter.cxx
+@@ -40,7 +40,7 @@ InputVectorDataListParameter::~InputVect
bool
InputVectorDataListParameter::SetListFromFileName(const std::vector<std::string> & filenames)
{
@@ -815,9 +862,9 @@ Last-Update: 2015-12-22
this->ClearValue();
bool isOk = true;
---- otb.orig/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputVectorDataParameter.cxx
-+++ otb/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputVectorDataParameter.cxx
-@@ -37,7 +37,7 @@
+--- a/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputVectorDataParameter.cxx
++++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputVectorDataParameter.cxx
+@@ -37,7 +37,7 @@ InputVectorDataParameter::~InputVectorDa
bool
InputVectorDataParameter::SetFromFileName(const std::string& filename)
{
@@ -826,8 +873,8 @@ Last-Update: 2015-12-22
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
+--- a/Examples/DataRepresentation/Mesh/PointSetWithVectors.cxx
++++ b/Examples/DataRepresentation/Mesh/PointSetWithVectors.cxx
@@ -25,7 +25,7 @@
// This example illustrates how a point set can be parameterized to manage a
// particular pixel type. It is quite common to associate vector values with
@@ -837,8 +884,8 @@ Last-Update: 2015-12-22
// how vector values can be used as pixel type on the PointSet class. The
// \doxygen{itk}{Vector} class is used here as the pixel type. This class is
// appropriate for representing the relative position between two points. It
---- otb.orig/Examples/IO/HDFReaderExample.cxx
-+++ otb/Examples/IO/HDFReaderExample.cxx
+--- a/Examples/IO/HDFReaderExample.cxx
++++ b/Examples/IO/HDFReaderExample.cxx
@@ -36,7 +36,7 @@
// OTB is using GDAL to support HDF. HDF4 and HDF5 supports in Gdal is
// not activated by default. You need to download the HDF run-time
@@ -848,7 +895,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 @@
+@@ -87,9 +87,9 @@ int main(int itkNotUsed(argc), char * ar
// Software Guide : BeginLatex
//
@@ -860,8 +907,8 @@ Last-Update: 2015-12-22
// You can find below how to print the name and the decription
// of all the subdatasets.
//
---- otb.orig/Examples/IO/ImageToKmzAndMapFileProductExample.cxx
-+++ otb/Examples/IO/ImageToKmzAndMapFileProductExample.cxx
+--- a/Examples/IO/ImageToKmzAndMapFileProductExample.cxx
++++ b/Examples/IO/ImageToKmzAndMapFileProductExample.cxx
@@ -30,7 +30,7 @@
// and MapFile products.
// Note that the \doxygen{otb}{KmzProductWriter} and the
@@ -871,7 +918,7 @@ Last-Update: 2015-12-22
//
// The first step toward the use of these filters is to include the
// proper header files: the one for the rpc sensor estimation filter and
-@@ -113,7 +113,7 @@
+@@ -113,7 +113,7 @@ int main(int argc, char* argv[])
// or its keywordlist is updated. In general, a dozen of GCPs are
// needed to estimate an accurate sensor model. The points are added
// via the method AddGCP(PointType2D, PointType3D). The outpput image
@@ -880,9 +927,9 @@ Last-Update: 2015-12-22
// process.
//
// Software Guide : EndLatex
---- otb.orig/Examples/Radiometry/AtmosphericCorrectionSequencement.cxx
-+++ otb/Examples/Radiometry/AtmosphericCorrectionSequencement.cxx
-@@ -302,7 +302,7 @@
+--- a/Examples/Radiometry/AtmosphericCorrectionSequencement.cxx
++++ b/Examples/Radiometry/AtmosphericCorrectionSequencement.cxx
+@@ -302,7 +302,7 @@ int main(int argc, char *argv[])
// These {\em containers} will be given to the static function \texttt{Compute}
// from \doxygen{otb}{RadiometryCorrectionParametersToAtmosphericRadiativeTerms}
// class, which will call a 6S routine that will compute the needed
@@ -891,7 +938,7 @@ Last-Update: 2015-12-22
// \doxygen{otb}{AtmosphericRadiativeTerms} class instance.
// For this,
// \doxygen{otb}{RadiometryCorrectionParametersToAtmosphericRadiativeTerms},
-@@ -461,7 +461,7 @@
+@@ -461,7 +461,7 @@ int main(int argc, char *argv[])
// Software Guide : BeginLatex
//
// Once those parameters are loaded, they are used by the 6S library
@@ -900,7 +947,7 @@ Last-Update: 2015-12-22
// RadiometryCorrectionParametersToAtmosphericRadiativeTerms class
// provides a static function to perform this step\footnote{Before version
// 4.2, it was done with the filter
-@@ -548,7 +548,7 @@
+@@ -548,7 +548,7 @@ int main(int argc, char *argv[])
// Next (and last step) is the neighborhood correction.
// For this, the SurfaceAdjacencyEffectCorrectionSchemeFilter class is used.
// The previous surface reflectance inversion is performed under the assumption of a
@@ -909,9 +956,9 @@ Last-Update: 2015-12-22
// effect on the radiometry of pixels. The method is based on the decomposition of
// the observed signal as the summation of the own contribution of the target pixel and
// of the contributions of neighbored pixels moderated by their distance to the target pixel.
---- otb.orig/Examples/Simulation/ProsailModel.cxx
-+++ otb/Examples/Simulation/ProsailModel.cxx
-@@ -238,7 +238,7 @@
+--- a/Examples/Simulation/ProsailModel.cxx
++++ b/Examples/Simulation/ProsailModel.cxx
+@@ -238,7 +238,7 @@ int main(int argc, char *argv[])
// \item PSI 0
// \end{itemize}
//
@@ -920,9 +967,9 @@ Last-Update: 2015-12-22
// 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 @@
+--- a/Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h
++++ b/Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h
+@@ -522,7 +522,7 @@ private:
#if 0
/** Related DataSource.
@@ -931,9 +978,9 @@ Last-Update: 2015-12-22
*/
DataSourcePtr m_DataSource;
#endif
---- otb.orig/Modules/Adapters/OSSIMAdapters/include/otbImageKeywordlist.h
-+++ otb/Modules/Adapters/OSSIMAdapters/include/otbImageKeywordlist.h
-@@ -137,7 +137,7 @@
+--- a/Modules/Adapters/OSSIMAdapters/include/otbImageKeywordlist.h
++++ b/Modules/Adapters/OSSIMAdapters/include/otbImageKeywordlist.h
+@@ -137,7 +137,7 @@ protected:
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
@@ -942,9 +989,9 @@ Last-Update: 2015-12-22
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 @@
+--- a/Modules/Applications/AppFusion/app/otbBundleToPerfectSensor.cxx
++++ b/Modules/Applications/AppFusion/app/otbBundleToPerfectSensor.cxx
+@@ -154,7 +154,7 @@ private:
// Setup the DEM Handler
otb::Wrapper::ElevationParametersHandler::SetupDEMHandlerFromElevationParameters(this,"elev");
@@ -953,9 +1000,9 @@ Last-Update: 2015-12-22
FloatVectorImageType::SpacingType spacing = panchro->GetSpacing();
FloatVectorImageType::IndexType start = panchro->GetLargestPossibleRegion().GetIndex();
FloatVectorImageType::SizeType size = panchro->GetLargestPossibleRegion().GetSize();
---- otb.orig/Modules/Applications/AppImageUtils/app/otbPixelValue.cxx
-+++ otb/Modules/Applications/AppImageUtils/app/otbPixelValue.cxx
-@@ -148,7 +148,7 @@
+--- a/Modules/Applications/AppImageUtils/app/otbPixelValue.cxx
++++ b/Modules/Applications/AppImageUtils/app/otbPixelValue.cxx
+@@ -148,7 +148,7 @@ private:
SetParameterString("value", oss.str());
@@ -964,9 +1011,9 @@ Last-Update: 2015-12-22
otbAppLogINFO( << oss.str() );
}
---- otb.orig/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.h
-+++ otb/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.h
-@@ -68,7 +68,7 @@
+--- a/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.h
++++ b/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.h
+@@ -68,7 +68,7 @@ protected:
/** GenerateOutputInformation
* Set the number of bands of the output.
@@ -975,9 +1022,9 @@ Last-Update: 2015-12-22
**/
virtual void GenerateOutputInformation(void);
---- otb.orig/Modules/Core/Transform/include/otbGenericRSTransform.txx
-+++ otb/Modules/Core/Transform/include/otbGenericRSTransform.txx
-@@ -65,7 +65,7 @@
+--- a/Modules/Core/Transform/include/otbGenericRSTransform.txx
++++ b/Modules/Core/Transform/include/otbGenericRSTransform.txx
+@@ -65,7 +65,7 @@ GenericRSTransform<TScalarType, NInputDi
}
/**
@@ -986,9 +1033,9 @@ Last-Update: 2015-12-22
*/
template<class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
void
---- otb.orig/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h
-+++ otb/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h
-@@ -79,7 +79,7 @@
+--- a/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h
++++ b/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h
+@@ -79,7 +79,7 @@ protected:
/** GenerateOutputInformation
* Set the number of bands of the output.
@@ -997,9 +1044,9 @@ Last-Update: 2015-12-22
**/
virtual void GenerateOutputInformation(void);
---- otb.orig/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.txx
-+++ otb/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.txx
-@@ -103,7 +103,7 @@
+--- a/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.txx
++++ b/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.txx
+@@ -103,7 +103,7 @@ UnaryImageFunctorWithVectorImageFilter<T
OutputPixelType outPixel;
outPixel.SetSize(inputPtr->GetNumberOfComponentsPerPixel());
outPixel.Fill(itk::NumericTraits<OutputInternalPixelType>::Zero);
@@ -1008,9 +1055,9 @@ Last-Update: 2015-12-22
if (inPixel != nullPixel)
{
for (unsigned int j = 0; j < inputPtr->GetNumberOfComponentsPerPixel(); ++j)
---- otb.orig/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h
-+++ otb/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h
-@@ -32,7 +32,7 @@
+--- a/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h
++++ b/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h
+@@ -32,7 +32,7 @@ namespace otb
*
* This class uses the otb::StreamingResampleImageFilter. It defines
* and uses a otb::GenericRSTransform using the input/output coordinate
@@ -1019,9 +1066,9 @@ Last-Update: 2015-12-22
* output image with the Size/Origin/Spacing/StartIndex defined by
* the user. Note that there are no default values for all the
* parmeters, so it is mandatory to set correct parameters to have a
---- otb.orig/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.txx
-+++ otb/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.txx
-@@ -262,7 +262,7 @@
+--- a/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.txx
++++ b/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.txx
+@@ -262,7 +262,7 @@ VectorDataProjectionFilter<TInputVectorD
}
/**
@@ -1030,9 +1077,9 @@ Last-Update: 2015-12-22
*/
template <class TInputVectorData, class TOutputVectorData>
void
---- otb.orig/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.h
-+++ otb/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.h
-@@ -216,7 +216,7 @@
+--- a/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.h
++++ b/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.h
+@@ -216,7 +216,7 @@ protected:
/** GenerateOutputInformation
* Set the size of the output image depending on the decimation factor
@@ -1041,7 +1088,7 @@ Last-Update: 2015-12-22
**/
virtual void GenerateOutputInformation();
-@@ -401,7 +401,7 @@
+@@ -401,7 +401,7 @@ protected:
/** GenerateOutputInformation
* Set the size of the output image depending on the decimation factor
@@ -1050,9 +1097,9 @@ Last-Update: 2015-12-22
**/
virtual void GenerateOutputInformation();
---- otb.orig/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.h
-+++ otb/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.h
-@@ -325,7 +325,7 @@
+--- a/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.h
++++ b/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.h
+@@ -325,7 +325,7 @@ protected:
/** GenerateOutputInformation
* Set the size of the output image depending on the decimation factor
@@ -1061,9 +1108,9 @@ Last-Update: 2015-12-22
**/
virtual void GenerateOutputInformation();
---- otb.orig/Modules/Filtering/Wavelet/include/otbWaveletTransform.h
-+++ otb/Modules/Filtering/Wavelet/include/otbWaveletTransform.h
-@@ -308,7 +308,7 @@
+--- a/Modules/Filtering/Wavelet/include/otbWaveletTransform.h
++++ b/Modules/Filtering/Wavelet/include/otbWaveletTransform.h
+@@ -308,7 +308,7 @@ protected:
/** GenerateOutputInformation
* Set the size of the output image depending on the decimation factor
@@ -1072,9 +1119,9 @@ Last-Update: 2015-12-22
**/
virtual void GenerateOutputInformation();
---- otb.orig/Modules/IO/Carto/include/otbWorldFile.h
-+++ otb/Modules/IO/Carto/include/otbWorldFile.h
-@@ -28,7 +28,7 @@
+--- a/Modules/IO/Carto/include/otbWorldFile.h
++++ b/Modules/IO/Carto/include/otbWorldFile.h
+@@ -28,7 +28,7 @@ namespace otb {
/**
* \class WorldFile
@@ -1083,9 +1130,9 @@ Last-Update: 2015-12-22
*
* The world file format is detailed at
* http://en.wikipedia.org/wiki/World_file
---- otb.orig/Modules/IO/Carto/src/otbOSMDataToVectorDataGenerator.cxx
-+++ otb/Modules/IO/Carto/src/otbOSMDataToVectorDataGenerator.cxx
-@@ -193,7 +193,7 @@
+--- a/Modules/IO/Carto/src/otbOSMDataToVectorDataGenerator.cxx
++++ b/Modules/IO/Carto/src/otbOSMDataToVectorDataGenerator.cxx
+@@ -193,7 +193,7 @@ void OSMDataToVectorDataGenerator::Parse
// Get the value of the key
std::string resultValue = currentTag->Attribute("v");
@@ -1094,9 +1141,9 @@ Last-Update: 2015-12-22
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 @@
+--- a/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToReaderOptions.h
++++ b/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToReaderOptions.h
+@@ -30,8 +30,8 @@ namespace otb
* - &geom : to specify an external geom file
* - &sdataidx : sub-dataset index for composite files
* - &resol : resolution factor for jpeg200 files
@@ -1107,9 +1154,9 @@ Last-Update: 2015-12-22
*
* \sa ImageFileReader
*
---- otb.orig/Modules/IO/IOBSQ/include/otbBSQImageIO.h
-+++ otb/Modules/IO/IOBSQ/include/otbBSQImageIO.h
-@@ -139,7 +139,7 @@
+--- a/Modules/IO/IOBSQ/include/otbBSQImageIO.h
++++ b/Modules/IO/IOBSQ/include/otbBSQImageIO.h
+@@ -139,7 +139,7 @@ private:
BSQImageIO(const Self &); //purposely not implemented
void operator =(const Self&); //purposely not implemented
@@ -1118,9 +1165,9 @@ Last-Update: 2015-12-22
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
-@@ -108,7 +108,7 @@
+--- a/Modules/IO/IOBSQ/src/otbBSQImageIO.cxx
++++ b/Modules/IO/IOBSQ/src/otbBSQImageIO.cxx
+@@ -108,7 +108,7 @@ bool BSQImageIO::CanReadFile(const char*
otbMsgDevMacro(<< "BSQImageIO::CanReadFile() failed header open ! ");
return false;
}
@@ -1129,7 +1176,7 @@ Last-Update: 2015-12-22
bool lResult = InternalReadHeaderInformation(lFileName, header_file, false);
header_file.close();
return (lResult);
-@@ -231,7 +231,7 @@
+@@ -231,7 +231,7 @@ void BSQImageIO::ReadImageInformation()
itkExceptionMacro(<< "BSQImageIO::ReadImageInformation() failed header open ! ");
}
@@ -1138,7 +1185,7 @@ Last-Update: 2015-12-22
InternalReadHeaderInformation(m_FileName, m_HeaderFile, true);
otbMsgDebugMacro(<< "Driver to read: BSQ");
-@@ -375,7 +375,7 @@
+@@ -375,7 +375,7 @@ bool BSQImageIO::InternalReadHeaderInfor
}
file >> m_Dimensions[0];
@@ -1147,7 +1194,7 @@ Last-Update: 2015-12-22
file >> lString;
std::string lStrBitsPerPixels(lString);
file >> lString;
-@@ -397,7 +397,7 @@
+@@ -397,7 +397,7 @@ bool BSQImageIO::InternalReadHeaderInfor
int lNbBitsPerPixels;
file >> lNbBitsPerPixels;
@@ -1156,7 +1203,7 @@ Last-Update: 2015-12-22
file >> lString;
if (lString.empty() == false)
{
-@@ -616,11 +616,11 @@
+@@ -616,11 +616,11 @@ void BSQImageIO::WriteImageInformation()
m_HeaderFile << "COLUMNS" << std::endl;
m_HeaderFile << m_Dimensions[0] << std::endl;
@@ -1170,9 +1217,9 @@ Last-Update: 2015-12-22
m_HeaderFile << "SENSCODAGE" << std::endl;
if (m_ByteOrder == LittleEndian)
{
---- otb.orig/Modules/IO/IOGDAL/test/otbGDALImageIOTestWriteMetadata.cxx
-+++ otb/Modules/IO/IOGDAL/test/otbGDALImageIOTestWriteMetadata.cxx
-@@ -564,7 +564,7 @@
+--- a/Modules/IO/IOGDAL/test/otbGDALImageIOTestWriteMetadata.cxx
++++ b/Modules/IO/IOGDAL/test/otbGDALImageIOTestWriteMetadata.cxx
+@@ -564,7 +564,7 @@ bool writeReadDatasetMetadata(std::strin
abyRaster, 128, 128, GDT_Byte, 0, 0 );
@@ -1181,7 +1228,7 @@ Last-Update: 2015-12-22
infoDatasetCreate->m_Name = "Create";
infoDatasetCreate->m_ProjRef = static_cast<std::string>(poDstDS->GetProjectionRef());
-@@ -593,7 +593,7 @@
+@@ -593,7 +593,7 @@ bool writeReadDatasetMetadata(std::strin
if( poDataset == NULL )
return false;
@@ -1190,9 +1237,9 @@ Last-Update: 2015-12-22
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 @@
+--- a/Modules/IO/IOGDAL/test/otbGDALReadPxlComplex.cxx
++++ b/Modules/IO/IOGDAL/test/otbGDALReadPxlComplex.cxx
+@@ -38,7 +38,7 @@ int otbGDALReadPxlComplexGeneric(int arg
// Get Input parameters
if (argc != 6)
{
@@ -1201,7 +1248,7 @@ Last-Update: 2015-12-22
return EXIT_FAILURE;
}
int posX = (int)atoi(argv[2]);
-@@ -56,7 +56,7 @@
+@@ -56,7 +56,7 @@ int otbGDALReadPxlComplexGeneric(int arg
if( poDataset == NULL )
return EXIT_FAILURE;
@@ -1210,9 +1257,9 @@ Last-Update: 2015-12-22
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 @@
+--- a/Modules/IO/IOLUM/include/otbLUMImageIO.h
++++ b/Modules/IO/IOLUM/include/otbLUMImageIO.h
+@@ -137,7 +137,7 @@ private:
LUMImageIO(const Self &); //purposely not implemented
void operator =(const Self&); //purposely not implemented
@@ -1221,9 +1268,9 @@ Last-Update: 2015-12-22
bool InternalReadHeaderInformation(std::fstream& file, const bool reportError);
/** This method get the LUM type */
int CaiGetTypeLum(const char * type_code,
---- otb.orig/Modules/IO/IOLUM/src/otbLUMImageIO.cxx
-+++ otb/Modules/IO/IOLUM/src/otbLUMImageIO.cxx
-@@ -106,7 +106,7 @@
+--- a/Modules/IO/IOLUM/src/otbLUMImageIO.cxx
++++ b/Modules/IO/IOLUM/src/otbLUMImageIO.cxx
+@@ -106,7 +106,7 @@ bool LUMImageIO::CanReadFile(const char*
return false;
}
@@ -1232,7 +1279,7 @@ Last-Update: 2015-12-22
bool lResult = InternalReadHeaderInformation(header_file, false);
header_file.close();
return (lResult);
-@@ -195,7 +195,7 @@
+@@ -195,7 +195,7 @@ void LUMImageIO::ReadImageInformation()
itkExceptionMacro(<< "LUMImageIO::ReadImageInformation() failed header open ! ");
}
@@ -1241,7 +1288,7 @@ Last-Update: 2015-12-22
InternalReadHeaderInformation(m_File, true);
otbMsgDebugMacro(<< "Driver to read: LUM");
-@@ -227,7 +227,7 @@
+@@ -227,7 +227,7 @@ bool LUMImageIO::InternalReadHeaderInfor
{
if (reportError == true)
{
@@ -1250,7 +1297,7 @@ Last-Update: 2015-12-22
}
else
{
-@@ -300,7 +300,7 @@
+@@ -300,7 +300,7 @@ bool LUMImageIO::InternalReadHeaderInfor
otbSwappFileOrderToSystemOrderMacro(int, &NbCol, 1);
otbSwappFileOrderToSystemOrderMacro(int, &NbLig, 1);
@@ -1259,9 +1306,9 @@ Last-Update: 2015-12-22
m_Dimensions[0] = NbCol;
m_Dimensions[1] = NbLig;
this->SetNumberOfComponents(1);
---- otb.orig/Modules/IO/IOMW/include/otbMWImageIO.h
-+++ otb/Modules/IO/IOMW/include/otbMWImageIO.h
-@@ -141,7 +141,7 @@
+--- a/Modules/IO/IOMW/include/otbMWImageIO.h
++++ b/Modules/IO/IOMW/include/otbMWImageIO.h
+@@ -141,7 +141,7 @@ private:
std::string GetExtension(const std::string& filename);
@@ -1270,9 +1317,9 @@ Last-Update: 2015-12-22
bool InternalReadHeaderInformation(std::fstream& file, const bool reportError);
inline void ByteSplitting(unsigned short a, unsigned short& low, unsigned short& high)
{
---- otb.orig/Modules/IO/IOMW/src/otbMWImageIO.cxx
-+++ otb/Modules/IO/IOMW/src/otbMWImageIO.cxx
-@@ -91,7 +91,7 @@
+--- a/Modules/IO/IOMW/src/otbMWImageIO.cxx
++++ b/Modules/IO/IOMW/src/otbMWImageIO.cxx
+@@ -91,7 +91,7 @@ bool MWImageIO::CanReadFile(const char*
return false;
}
@@ -1281,7 +1328,7 @@ Last-Update: 2015-12-22
bool lResult = InternalReadHeaderInformation(header_file, false);
header_file.close();
return (lResult);
-@@ -172,7 +172,7 @@
+@@ -172,7 +172,7 @@ void MWImageIO::ReadImageInformation()
itkExceptionMacro(<< "MWImageIO::ReadImageInformation() failed header open ! ");
}
@@ -1290,7 +1337,7 @@ Last-Update: 2015-12-22
InternalReadHeaderInformation(m_File, true);
otbMsgDebugMacro(<< "Driver to read: MW");
-@@ -227,7 +227,7 @@
+@@ -227,7 +227,7 @@ bool MWImageIO::InternalReadHeaderInform
SetComponentType(FLOAT);
@@ -1299,9 +1346,9 @@ Last-Update: 2015-12-22
m_Dimensions[0] = NbCol;
m_Dimensions[1] = NbLig;
this->SetNumberOfComponents(1);
---- otb.orig/Modules/IO/IORAD/include/otbRADImageIO.h
-+++ otb/Modules/IO/IORAD/include/otbRADImageIO.h
-@@ -139,7 +139,7 @@
+--- a/Modules/IO/IORAD/include/otbRADImageIO.h
++++ b/Modules/IO/IORAD/include/otbRADImageIO.h
+@@ -139,7 +139,7 @@ private:
RADImageIO(const Self &); //purposely not implemented
void operator =(const Self&); //purposely not implemented
@@ -1310,9 +1357,9 @@ Last-Update: 2015-12-22
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 @@
+--- a/Modules/IO/IORAD/src/otbRADImageIO.cxx
++++ b/Modules/IO/IORAD/src/otbRADImageIO.cxx
+@@ -112,7 +112,7 @@ bool RADImageIO::CanReadFile(const char*
return false;
}
@@ -1321,7 +1368,7 @@ Last-Update: 2015-12-22
bool lResult = InternalReadHeaderInformation(lFileName, header_file, false);
header_file.close();
return (lResult);
-@@ -236,7 +236,7 @@
+@@ -236,7 +236,7 @@ void RADImageIO::ReadImageInformation()
itkExceptionMacro(<< "RADImageIO::ReadImageInformation() failed header open ! ");
}
@@ -1330,7 +1377,7 @@ Last-Update: 2015-12-22
InternalReadHeaderInformation(m_FileName, m_HeaderFile, true);
otbMsgDebugMacro(<< "Driver to read: RAD");
-@@ -416,7 +416,7 @@
+@@ -416,7 +416,7 @@ bool RADImageIO::InternalReadHeaderInfor
}
}
@@ -1339,7 +1386,7 @@ Last-Update: 2015-12-22
file >> lString;
if (lString.empty() == false)
{
-@@ -704,7 +704,7 @@
+@@ -704,7 +704,7 @@ void RADImageIO::WriteImageInformation()
}
m_HeaderFile << m_TypeRAD << std::endl;
@@ -1348,9 +1395,9 @@ Last-Update: 2015-12-22
m_HeaderFile << "SENSCODAGE "; // << std::endl;
if (m_ByteOrder == LittleEndian)
{
---- otb.orig/Modules/IO/IOTileMap/src/otbTileMapImageIO.cxx
-+++ otb/Modules/IO/IOTileMap/src/otbTileMapImageIO.cxx
-@@ -209,7 +209,7 @@
+--- a/Modules/IO/IOTileMap/src/otbTileMapImageIO.cxx
++++ b/Modules/IO/IOTileMap/src/otbTileMapImageIO.cxx
+@@ -209,7 +209,7 @@ void TileMapImageIO::GenerateTileInfo(do
std::ostringstream filename;
BuildFileName(quad2, filename);
@@ -1359,9 +1406,9 @@ Last-Update: 2015-12-22
TileNameAndCoordType lTileInfos;
lTileInfos.numTileX = numTileX;
lTileInfos.numTileY = numTileY;
---- otb.orig/Modules/IO/ImageIO/include/otbImageSeriesFileReader.h
-+++ otb/Modules/IO/ImageIO/include/otbImageSeriesFileReader.h
-@@ -57,7 +57,7 @@
+--- a/Modules/IO/ImageIO/include/otbImageSeriesFileReader.h
++++ b/Modules/IO/ImageIO/include/otbImageSeriesFileReader.h
+@@ -57,7 +57,7 @@ public:
/** Creation through object factory macro */
itkNewMacro(Self);
@@ -1370,7 +1417,7 @@ Last-Update: 2015-12-22
itkTypeMacro(ImageSeriesFileReader, ImageSeriesFileReaderBase);
typedef typename Superclass::OutputImageType OutputImageType;
-@@ -170,7 +170,7 @@
+@@ -170,7 +170,7 @@ public:
/** Creation through object factory macro */
itkNewMacro(Self);
@@ -1379,7 +1426,7 @@ Last-Update: 2015-12-22
itkTypeMacro(ImageSeriesFileReader, ImageSeriesFileReaderBase);
typedef typename Superclass::OutputImageType OutputImageType;
-@@ -276,7 +276,7 @@
+@@ -276,7 +276,7 @@ public:
/** Creation through object factory macro */
itkNewMacro(Self);
@@ -1388,7 +1435,7 @@ Last-Update: 2015-12-22
itkTypeMacro(ImageSeriesFileReader, ImageSeriesFileReaderBase);
typedef typename Superclass::OutputImageType OutputImageType;
-@@ -383,7 +383,7 @@
+@@ -383,7 +383,7 @@ public:
/** Creation through object factory macro */
itkNewMacro(Self);
@@ -1397,9 +1444,9 @@ Last-Update: 2015-12-22
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 @@
+--- a/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h
++++ b/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h
+@@ -71,7 +71,7 @@ public:
/** Creation through object factory macro */
itkNewMacro(Self);
@@ -1408,9 +1455,9 @@ Last-Update: 2015-12-22
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 @@
+--- a/Modules/IO/KMZWriter/include/otbKmzProductWriter.h
++++ b/Modules/IO/KMZWriter/include/otbKmzProductWriter.h
+@@ -44,7 +44,7 @@ namespace otb
/** \class KmzProductWriter
* \brief This class generate a Kmz from one or several input
@@ -1419,9 +1466,9 @@ Last-Update: 2015-12-22
*
* This class writes kmz files, supported by Google Earth. The input
* must have metadata (a non empty keywordlist)
---- otb.orig/Modules/IO/KMZWriter/include/otbKmzProductWriter.txx
-+++ otb/Modules/IO/KMZWriter/include/otbKmzProductWriter.txx
-@@ -117,7 +117,7 @@
+--- a/Modules/IO/KMZWriter/include/otbKmzProductWriter.txx
++++ b/Modules/IO/KMZWriter/include/otbKmzProductWriter.txx
+@@ -117,7 +117,7 @@ KmzProductWriter<TInputImage>
if(emptyProjRef && emptyKWL)
{
@@ -1430,9 +1477,9 @@ Last-Update: 2015-12-22
}
// Continue processing
---- otb.orig/Modules/Learning/LearningBase/include/otbDecisionTree.h
-+++ otb/Modules/Learning/LearningBase/include/otbDecisionTree.h
-@@ -68,7 +68,7 @@
+--- a/Modules/Learning/LearningBase/include/otbDecisionTree.h
++++ b/Modules/Learning/LearningBase/include/otbDecisionTree.h
+@@ -68,7 +68,7 @@ public:
/** Creation through object factory macro */
itkNewMacro(Self);
@@ -1441,9 +1488,9 @@ Last-Update: 2015-12-22
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 @@
+--- a/Modules/Learning/SOM/include/otbPeriodicSOM.h
++++ b/Modules/Learning/SOM/include/otbPeriodicSOM.h
+@@ -72,7 +72,7 @@ public:
/** Creation through object factory macro */
itkNewMacro(Self);
@@ -1452,9 +1499,9 @@ Last-Update: 2015-12-22
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 @@
+--- a/Modules/Learning/SOM/include/otbSOM.h
++++ b/Modules/Learning/SOM/include/otbSOM.h
+@@ -68,7 +68,7 @@ public:
/** Creation through object factory macro */
itkNewMacro(Self);
@@ -1463,9 +1510,9 @@ Last-Update: 2015-12-22
itkTypeMacro(SOM, ImageSource);
typedef TListSample ListSampleType;
---- otb.orig/Modules/Learning/SOM/include/otbSOMMap.h
-+++ otb/Modules/Learning/SOM/include/otbSOMMap.h
-@@ -63,7 +63,7 @@
+--- a/Modules/Learning/SOM/include/otbSOMMap.h
++++ b/Modules/Learning/SOM/include/otbSOMMap.h
+@@ -63,7 +63,7 @@ public:
/** Creation through object factory macro */
itkNewMacro(Self);
/**
@@ -1474,9 +1521,9 @@ Last-Update: 2015-12-22
* this class has to be considered to as a simple VectorImage
* // itkTypeMacro(SOMMap, VectorImage);
* */
---- otb.orig/Modules/Learning/SOM/include/otbSOMWithMissingValue.h
-+++ otb/Modules/Learning/SOM/include/otbSOMWithMissingValue.h
-@@ -72,7 +72,7 @@
+--- a/Modules/Learning/SOM/include/otbSOMWithMissingValue.h
++++ b/Modules/Learning/SOM/include/otbSOMWithMissingValue.h
+@@ -72,7 +72,7 @@ public:
/** Creation through object factory macro */
itkNewMacro(Self);
@@ -1485,9 +1532,9 @@ Last-Update: 2015-12-22
itkTypeMacro(SOMWithMissingValue, PeriodicSOM);
protected:
---- otb.orig/Modules/Learning/SVMLearning/include/otbSVMImageClassificationWithRuleFilter.h
-+++ otb/Modules/Learning/SVMLearning/include/otbSVMImageClassificationWithRuleFilter.h
-@@ -95,7 +95,7 @@
+--- a/Modules/Learning/SVMLearning/include/otbSVMImageClassificationWithRuleFilter.h
++++ b/Modules/Learning/SVMLearning/include/otbSVMImageClassificationWithRuleFilter.h
+@@ -95,7 +95,7 @@ protected:
/** GenerateOutputInformation
* Set the number of bands of the output rule image.
@@ -1496,9 +1543,9 @@ Last-Update: 2015-12-22
**/
virtual void GenerateOutputInformation();
---- otb.orig/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h
-+++ otb/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h
-@@ -71,7 +71,7 @@
+--- a/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h
++++ b/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h
+@@ -71,7 +71,7 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through the object factory */
itkNewMacro(Self);
@@ -1507,7 +1554,7 @@ Last-Update: 2015-12-22
itkTypeMacro(RCC8GraphFileReader, RCC8GraphSource);
/** Output related typedefs */
typedef TOutputGraph OutputGraphType;
-@@ -93,12 +93,12 @@
+@@ -93,12 +93,12 @@ protected:
/** Main computation method */
virtual void GenerateData();
/**
@@ -1522,9 +1569,9 @@ Last-Update: 2015-12-22
* \param line The line to parse.
*/
void ParseVertex(const std::string& line);
---- otb.orig/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.txx
-+++ otb/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.txx
-@@ -45,7 +45,7 @@
+--- a/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.txx
++++ b/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.txx
+@@ -45,7 +45,7 @@ RCC8GraphFileReader<TOutputGraph>
{
}
/**
@@ -1533,7 +1580,7 @@ Last-Update: 2015-12-22
* \param line The line to parse.
*/
template <class TOutputGraph>
-@@ -66,7 +66,7 @@
+@@ -66,7 +66,7 @@ RCC8GraphFileReader<TOutputGraph>
this->GetOutput()->AddEdge(source, target, value);
}
/**
@@ -1542,9 +1589,9 @@ Last-Update: 2015-12-22
* \param line The line to parse.
*/
template <class TOutputGraph>
---- otb.orig/Modules/Radiometry/OpticalCalibration/include/otbAeronetFileReader.h
-+++ otb/Modules/Radiometry/OpticalCalibration/include/otbAeronetFileReader.h
-@@ -82,7 +82,7 @@
+--- a/Modules/Radiometry/OpticalCalibration/include/otbAeronetFileReader.h
++++ b/Modules/Radiometry/OpticalCalibration/include/otbAeronetFileReader.h
+@@ -82,7 +82,7 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through the object factory */
itkNewMacro(Self);
@@ -1553,9 +1600,9 @@ Last-Update: 2015-12-22
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 @@
+--- a/Modules/Radiometry/OpticalCalibration/src/otbAeronetFileReader.cxx
++++ b/Modules/Radiometry/OpticalCalibration/src/otbAeronetFileReader.cxx
+@@ -237,7 +237,7 @@ AeronetFileReader
return;
}
@@ -1564,9 +1611,9 @@ Last-Update: 2015-12-22
std::getline(fin, line);
std::getline(fin, line);
std::getline(fin, line);
---- otb.orig/Modules/Radiometry/Simulation/include/otbSpectralResponse.txx
-+++ otb/Modules/Radiometry/Simulation/include/otbSpectralResponse.txx
-@@ -49,7 +49,7 @@
+--- a/Modules/Radiometry/Simulation/include/otbSpectralResponse.txx
++++ b/Modules/Radiometry/Simulation/include/otbSpectralResponse.txx
+@@ -49,7 +49,7 @@ void SpectralResponse<TPrecision, TValue
}
int NumLigne = 26; // Go to the line 27
@@ -1575,9 +1622,9 @@ Last-Update: 2015-12-22
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 @@
+--- a/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.h
++++ b/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.h
+@@ -43,7 +43,7 @@ namespace otb {
* Please note that the background value is also used in
* BurnAttributeModeOn() to fill areas where there are no geometries.
*
@@ -1586,9 +1633,9 @@ Last-Update: 2015-12-22
* - Setting the Origin/Size/Spacing of the output image
* - Using an existing image as support via SetOutputParametersFromImage(ImageBase)
*
---- otb.orig/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h
-+++ otb/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h
-@@ -37,7 +37,7 @@
+--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h
++++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h
+@@ -37,7 +37,7 @@ namespace otb {
* output raster. The burn values are extracted from a field set by
* the user.If no burning field is set, the "FID" is used by default.
*
@@ -1597,9 +1644,9 @@ Last-Update: 2015-12-22
* - Setting the Origin/Size/Spacing of the output image
* - Using an existing image as support via SetOutputParametersFromImage(ImageBase)
*
---- otb.orig/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalClosingProfileFilter.h
-+++ otb/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalClosingProfileFilter.h
-@@ -38,7 +38,7 @@
+--- a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalClosingProfileFilter.h
++++ b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalClosingProfileFilter.h
+@@ -38,7 +38,7 @@ namespace otb
* The opening profile is a set of images beeing the result of a geodesic morphological
* closing by reconstruction with an increasing range of structuring element sizes.
*
@@ -1608,9 +1655,9 @@ Last-Update: 2015-12-22
* class.
*
* \sa ImageToProfileFilter
---- otb.orig/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalOpeningProfileFilter.h
-+++ otb/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalOpeningProfileFilter.h
-@@ -38,7 +38,7 @@
+--- a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalOpeningProfileFilter.h
++++ b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalOpeningProfileFilter.h
+@@ -38,7 +38,7 @@ namespace otb
* The opening profile is a set of images beeing the result of a geodesic morphological
* opening by reconstruction with an increasing range of structuring element sizes.
*
@@ -1619,9 +1666,9 @@ Last-Update: 2015-12-22
* class.
*
* \sa ImageToProfileFilter
---- otb.orig/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
-+++ otb/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
-@@ -87,7 +87,7 @@
+--- a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
++++ b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
+@@ -87,7 +87,7 @@ protected:
/** GenerateOutputInformation
* Set the number of bands of the output.
@@ -1630,9 +1677,9 @@ Last-Update: 2015-12-22
**/
virtual void GenerateOutputInformation(void);
---- otb.orig/Modules/Applications/AppDimensionalityReduction/app/otbDimensionalityReduction.cxx
-+++ otb/Modules/Applications/AppDimensionalityReduction/app/otbDimensionalityReduction.cxx
-@@ -139,7 +139,7 @@
+--- a/Modules/Applications/AppDimensionalityReduction/app/otbDimensionalityReduction.cxx
++++ b/Modules/Applications/AppDimensionalityReduction/app/otbDimensionalityReduction.cxx
+@@ -139,7 +139,7 @@ private:
AddChoice("method.maf", "MAF");
SetParameterDescription("method.maf", "Maximum Autocorrelation Factor.");
AddChoice("method.ica", "ICA");
@@ -1641,9 +1688,9 @@ Last-Update: 2015-12-22
AddParameter(ParameterType_Int, "method.ica.iter", "number of iterations ");
SetMinimumParameterIntValue("method.ica.iter", 1);
SetDefaultParameterInt("method.ica.iter", 20);
---- otb.orig/Modules/Applications/AppVectorUtils/app/otbOSMDownloader.cxx
-+++ otb/Modules/Applications/AppVectorUtils/app/otbOSMDownloader.cxx
-@@ -53,7 +53,7 @@
+--- a/Modules/Applications/AppVectorUtils/app/otbOSMDownloader.cxx
++++ b/Modules/Applications/AppVectorUtils/app/otbOSMDownloader.cxx
+@@ -53,7 +53,7 @@ private:
SetDescription("Generate a vector data from OSM on the input image extend");
// Documentation
SetDocName("Open Street Map layers importations applications");
@@ -1652,9 +1699,9 @@ Last-Update: 2015-12-22
SetDocLimitations("None");
SetDocAuthors("OTB-Team");
SetDocSeeAlso("Convertion");
---- otb.orig/Modules/Filtering/DimensionalityReduction/otb-module.cmake
-+++ otb/Modules/Filtering/DimensionalityReduction/otb-module.cmake
-@@ -2,7 +2,7 @@
+--- a/Modules/Filtering/DimensionalityReduction/otb-module.cmake
++++ b/Modules/Filtering/DimensionalityReduction/otb-module.cmake
+@@ -2,7 +2,7 @@ set(DOCUMENTATION "Dimension reduction i
concentrates the amount of information in multivariate data into a fewer number of
variables (or dimensions). This module implements methods such as Principal Component
Analysis (PCA), Noise-Adjusted Principal Components Analysis (NAPCA), Maximum
@@ -1663,9 +1710,9 @@ Last-Update: 2015-12-22
Autocorrelation Factor (MAF), and so on.")
otb_module(OTBDimensionalityReduction
---- otb.orig/Examples/BasicFilters/BandMathFilterExample.cxx
-+++ otb/Examples/BasicFilters/BandMathFilterExample.cxx
-@@ -151,7 +151,7 @@
+--- a/Examples/BasicFilters/BandMathFilterExample.cxx
++++ b/Examples/BasicFilters/BandMathFilterExample.cxx
+@@ -151,7 +151,7 @@ int main( int argc, char* argv[])
//
// Now we can define the mathematical expression to perform on the layers (b1, b2, b3, b4).
// The filter takes advantage of the parsing capabilities of the muParser library and
@@ -1674,8 +1721,8 @@ Last-Update: 2015-12-22
//
// The expression below returns 255 if the ratio $(NIR-RED)/(NIR+RED)$ is greater than 0.4 and 0 if not.
//
---- otb.orig/Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx
-+++ otb/Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx
+--- a/Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx
++++ b/Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx
@@ -51,7 +51,7 @@
// something accepting the syntax \code{foo()}. This can be
// implemented using classical C/C++ functions, but it is preferable
@@ -1685,8 +1732,8 @@ Last-Update: 2015-12-22
// the same syntax as C/C++ functions.
//
// Since change detectors operate on neighborhoods, the functor
---- otb.orig/Examples/ChangeDetection/MultivariateAlterationDetector.cxx
-+++ otb/Examples/ChangeDetection/MultivariateAlterationDetector.cxx
+--- a/Examples/ChangeDetection/MultivariateAlterationDetector.cxx
++++ b/Examples/ChangeDetection/MultivariateAlterationDetector.cxx
@@ -32,8 +32,8 @@
// This example illustrates the class
// \doxygen{otb}{MultivariateAlterationChangeDetectorImageFilter},
@@ -1698,8 +1745,8 @@ Last-Update: 2015-12-22
// images with different number of bands or modalities. Its output is
// a a multi-band image of change maps, each one being unccorrelated
// with the remaining. The number of bands of the output image is the
---- otb.orig/Examples/FeatureExtraction/AlignmentsExample.cxx
-+++ otb/Examples/FeatureExtraction/AlignmentsExample.cxx
+--- a/Examples/FeatureExtraction/AlignmentsExample.cxx
++++ b/Examples/FeatureExtraction/AlignmentsExample.cxx
@@ -26,7 +26,7 @@
// Software Guide : BeginLatex
//
@@ -1709,8 +1756,8 @@ Last-Update: 2015-12-22
// (that is edges and lines) are detected using the {\em Gestalt}
// approach proposed by Desolneux et al. \cite{desolneux}. In this
// context, an event is
---- otb.orig/Examples/Filtering/RasterizationExample.cxx
-+++ otb/Examples/Filtering/RasterizationExample.cxx
+--- a/Examples/Filtering/RasterizationExample.cxx
++++ b/Examples/Filtering/RasterizationExample.cxx
@@ -24,7 +24,7 @@
// Software Guide : BeginLatex
@@ -1720,9 +1767,9 @@ Last-Update: 2015-12-22
// rasterization of a given vector data as a binary mask. This example
// will demonstrate how to use this filter to perform rasterization of
// the SRTM water body masks available here:
---- otb.orig/Examples/IO/DEMHandlerExample.cxx
-+++ otb/Examples/IO/DEMHandlerExample.cxx
-@@ -68,9 +68,9 @@
+--- a/Examples/IO/DEMHandlerExample.cxx
++++ b/Examples/IO/DEMHandlerExample.cxx
+@@ -68,9 +68,9 @@ if(argc!=8)
// Software Guide : BeginLatex
//
@@ -1734,9 +1781,9 @@ Last-Update: 2015-12-22
// can be set using the \code{SetDefaultHeightAboveEllipsoid()} method.
//
// Software Guide : EndLatex
---- otb.orig/Examples/IO/ImageReadRegionOfInterestWrite.cxx
-+++ otb/Examples/IO/ImageReadRegionOfInterestWrite.cxx
-@@ -93,8 +93,8 @@
+--- a/Examples/IO/ImageReadRegionOfInterestWrite.cxx
++++ b/Examples/IO/ImageReadRegionOfInterestWrite.cxx
+@@ -93,8 +93,8 @@ int main(int argc, char * argv[])
//
// The ExtractROI type is instantiated using
// the input and output pixel types. Using the pixel types as
@@ -1747,9 +1794,9 @@ Last-Update: 2015-12-22
// are used with scalar pixel types. See section
// \ref{sec:ExtractROI} for the extraction of ROIs on
// \doxygen{otb}{VectorImage}s. A filter object is created with the
---- otb.orig/Examples/Learning/TrainMachineLearningModelFromImagesExample.cxx
-+++ otb/Examples/Learning/TrainMachineLearningModelFromImagesExample.cxx
-@@ -178,7 +178,7 @@
+--- a/Examples/Learning/TrainMachineLearningModelFromImagesExample.cxx
++++ b/Examples/Learning/TrainMachineLearningModelFromImagesExample.cxx
+@@ -178,7 +178,7 @@ int main(int itkNotUsed(argc), char* arg
// \subdoxygen{itk}{Statistics}{ListSample} as input and estimates the label of each
// input sample using the model. Finally, the
// \doxygen{otb}{ImageClassificationModel} inherits from the
@@ -1758,9 +1805,9 @@ Last-Update: 2015-12-22
// input image by predicting their labels using a model.
//
// Software Guide : EndLatex
---- otb.orig/Examples/OBIA/HooverMetricsEstimation.cxx
-+++ otb/Examples/OBIA/HooverMetricsEstimation.cxx
-@@ -78,7 +78,7 @@
+--- a/Examples/OBIA/HooverMetricsEstimation.cxx
++++ b/Examples/OBIA/HooverMetricsEstimation.cxx
+@@ -78,7 +78,7 @@ int main(int argc, char* argv[])
// Software Guide : BeginLatex
// The filters \doxygen{otb}{HooverMatrixFilter} and \doxygen{otb}{HooverInstanceFilter}
// are designed to handle \doxygen{itk}{LabelMap} images, made with \doxygen{otb}{AttributesMapLabelObject}.
@@ -1769,9 +1816,9 @@ Last-Update: 2015-12-22
// 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 @@
+--- a/Modules/Adapters/OSSIMAdapters/include/otbDEMHandler.h
++++ b/Modules/Adapters/OSSIMAdapters/include/otbDEMHandler.h
+@@ -46,13 +46,13 @@ namespace otb
* configured by this class and this will ensure consistency
* throughout the library.
*
@@ -1788,9 +1835,23 @@ Last-Update: 2015-12-22
* height above Mean Sea Level (MSL).
*
* Here is the complete description of both methods output depending
---- otb.orig/Modules/Core/Common/include/otbModelComponentBase.txx
-+++ otb/Modules/Core/Common/include/otbModelComponentBase.txx
-@@ -187,7 +187,7 @@
+@@ -169,11 +169,11 @@ protected:
+
+ void PrintSelf(std::ostream& os, itk::Indent indent) const;
+
+- // Ossim does not allow to retrieve the geoid file path
++ // Ossim does not allow retrieving the geoid file path
+ // We therefore must keep it on our side
+ std::string m_GeoidFile;
+
+- // Ossim does not allow to retrieve the default height above
++ // Ossim does not allow retrieving the default height above
+ // ellipsoid We therefore must keep it on our side
+ double m_DefaultHeightAboveEllipsoid;
+
+--- a/Modules/Core/Common/include/otbModelComponentBase.txx
++++ b/Modules/Core/Common/include/otbModelComponentBase.txx
+@@ -187,7 +187,7 @@ ModelComponentBase<TSample>
::GenerateData()
{
/** subclasses should override this function to perform
@@ -1799,9 +1860,9 @@ Last-Update: 2015-12-22
* when necessary.
*/
m_SampleModified = 0;
---- otb.orig/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.h
-+++ otb/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.h
-@@ -71,7 +71,7 @@
+--- a/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.h
++++ b/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.h
+@@ -71,7 +71,7 @@ public:
* it needs to be redone here for this subclass to compile properly with gcc. */
typedef typename Superclass::ImageType ImageType;
@@ -1810,9 +1871,9 @@ Last-Update: 2015-12-22
* the location of the iterator. */
//typedef typename Superclass::OffsetType OffsetType;
typedef unsigned long OffsetType;
---- otb.orig/Modules/Core/ImageBase/include/otbMetaImageFunction.h
-+++ otb/Modules/Core/ImageBase/include/otbMetaImageFunction.h
-@@ -29,7 +29,7 @@
+--- a/Modules/Core/ImageBase/include/otbMetaImageFunction.h
++++ b/Modules/Core/ImageBase/include/otbMetaImageFunction.h
+@@ -29,7 +29,7 @@ namespace otb
/** \class MetaImageFunction
* \brief Concatenate results from multiple ImageFunction
*
@@ -1821,9 +1882,9 @@ Last-Update: 2015-12-22
* and to concatenate their result into a single VariableLengthVector.
*
* In the case of ImageFunction which do not produce VariableLengthVector, one can wrap these
---- otb.orig/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h
-+++ otb/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h
-@@ -31,7 +31,7 @@
+--- a/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h
++++ b/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h
+@@ -31,7 +31,7 @@ namespace otb
* \brief Extract a spatial or spectral subset of a multi-channel image.
*
* It is possible to extract all the channels from the input image or only those specified by the user.
@@ -1832,9 +1893,9 @@ Last-Update: 2015-12-22
* The SetFirstChannel() and SetLastChannel() methods allow the user to define a list of channels.
*
* \note If no channels are specified, then all channels from the input image are selected.
---- otb.orig/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h
-+++ otb/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h
-@@ -31,7 +31,7 @@
+--- a/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h
++++ b/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h
+@@ -31,7 +31,7 @@ namespace otb
* \brief Extract a mono channel part of a multi-channel image.
*
* This filter extracts either all channels or only those specified by the user.
@@ -1843,9 +1904,9 @@ Last-Update: 2015-12-22
* \note If nothing is specified, only the first channel is processed.
* \note This class is templated over the pixel types of the input and output images.
* The input image has to be an otb::VectorImage, whereas the output image has to be an otb::Image.
---- otb.orig/Modules/Core/LabelMap/include/otbAttributesMapLabelObject.h
-+++ otb/Modules/Core/LabelMap/include/otbAttributesMapLabelObject.h
-@@ -37,7 +37,7 @@
+--- a/Modules/Core/LabelMap/include/otbAttributesMapLabelObject.h
++++ b/Modules/Core/LabelMap/include/otbAttributesMapLabelObject.h
+@@ -37,7 +37,7 @@ namespace Functor
{
/** \class AttributesMapLabelObjectAccessor
@@ -1854,7 +1915,7 @@ Last-Update: 2015-12-22
*
* The name of the attribute to retrieve can be set by using the
* SetAttributeName method.
-@@ -88,9 +88,9 @@
+@@ -88,9 +88,9 @@ private:
/** \class AttributesMapMeasurementFunctor
@@ -1866,7 +1927,7 @@ Last-Update: 2015-12-22
*
* \ingroup OTBLabelMap
*/
-@@ -156,7 +156,7 @@
+@@ -156,7 +156,7 @@ private:
* store pairs of key, value (of type TAttributesValue) in an internal
* map container.
*
@@ -1875,9 +1936,9 @@ Last-Update: 2015-12-22
*
* \sa LabelObject, ShapeLabelObject, StatisticsLabelObject
*
---- otb.orig/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.h
-+++ otb/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.h
-@@ -28,7 +28,7 @@
+--- a/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.h
++++ b/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.h
+@@ -28,7 +28,7 @@ namespace otb
* \brief Attributes opening for AttributesMapLabelObject
*
* This class extends the itk::AttributeOpeningLabelMapFilter to
@@ -1886,9 +1947,9 @@ Last-Update: 2015-12-22
* for any kind of attributes in the attributes map.
*
* \sa AttributeLabelObject, AttributeOpeningLabelMapFilter
---- otb.orig/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.h
-+++ otb/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.h
-@@ -32,7 +32,7 @@
+--- a/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.h
++++ b/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.h
+@@ -32,7 +32,7 @@ namespace Functor
* StatisticsAttributesLabelObjectFunctor one each feature image
* provided through AddFeature()
*
@@ -1897,7 +1958,7 @@ Last-Update: 2015-12-22
* multiple features. It is used in the
* BandsStatisticsAttributesLabelMapFilter.
*
-@@ -123,7 +123,7 @@
+@@ -123,7 +123,7 @@ private:
* The feature name is constructed as:
* 'STATS' + '::' + 'Band' + band_index + '::' + statistic_name
*
@@ -1906,9 +1967,9 @@ Last-Update: 2015-12-22
* statistics filter to compute only the main attributes (mean, variance, skewness and kurtosis).
*
* \sa MultiStatsAttributesLabelObjectFunctor AttributesMapLabelObject
---- otb.orig/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.h
-+++ otb/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.h
-@@ -31,7 +31,7 @@
+--- a/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.h
++++ b/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.h
+@@ -31,7 +31,7 @@ namespace otb
* learning and classification.
*
* The conversion from label object to measurement vector is made
@@ -1917,9 +1978,9 @@ Last-Update: 2015-12-22
* via proper redefinition of the functor.
*
* \ingroup OTBLabelMap
---- otb.orig/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.h
-+++ otb/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.h
-@@ -28,7 +28,7 @@
+--- a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.h
++++ b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.h
+@@ -28,7 +28,7 @@ namespace otb
* and compatible with otb::SVMSampleListModelEstimator
*
* The conversion from label object to measurement vector is made
@@ -1928,9 +1989,9 @@ Last-Update: 2015-12-22
* via proper redefinition of the functor.
*
* \sa otb::SVMSampleListModelEstimator
---- otb.orig/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.h
-+++ otb/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.h
-@@ -187,7 +187,7 @@
+--- a/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.h
++++ b/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.h
+@@ -187,7 +187,7 @@ private:
* With respect to the original itk filter, this filter also compute
* the Flusser moments for each LabelObject.
*
@@ -1939,9 +2000,9 @@ Last-Update: 2015-12-22
* statistics and statistics usefull for classification (not spatially
* dependent statitistics). Reduced set contains only Flusser moments,
* physical size, elongation, Feret diameter (if activated),
---- otb.orig/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.h
-+++ otb/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.h
-@@ -113,7 +113,7 @@
+--- a/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.h
++++ b/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.h
+@@ -113,7 +113,7 @@ private:
* set. The key of the statistics features in the attributes map will
* be "STATS::FeatureName::StatisticName".
*
@@ -1950,9 +2011,9 @@ Last-Update: 2015-12-22
* statistics and statistics usefull for classification (not spatially
* dependent statitistics). Reduced set contains only mean, variance,
* skewness and kurtosis.
---- otb.orig/Modules/Core/ObjectList/include/otbImageList.h
-+++ otb/Modules/Core/ObjectList/include/otbImageList.h
-@@ -25,7 +25,7 @@
+--- a/Modules/Core/ObjectList/include/otbImageList.h
++++ b/Modules/Core/ObjectList/include/otbImageList.h
+@@ -25,7 +25,7 @@ namespace otb
/** \class ImageList
* \brief This class represent a list of images.
*
@@ -1961,9 +2022,9 @@ Last-Update: 2015-12-22
* object list with the appropriate formalism (iterators, accessors).
* \sa ObjectList
*
---- otb.orig/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
-+++ otb/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
-@@ -27,18 +27,18 @@
+--- a/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
++++ b/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
+@@ -27,18 +27,18 @@ namespace otb
/** \class PipelineMemoryPrintCalculator
* \brief Estimate pipeline memory usage and optimal stream divisions
*
@@ -1985,7 +2046,7 @@ Last-Update: 2015-12-22
* stream division to write the data. To do so, the available memory
* can be set via the SetAvailableMemory() method, and an optional
* bias correction factor can be applied to weight the estimate
-@@ -55,7 +55,7 @@
+@@ -55,7 +55,7 @@ namespace otb
* within composite filter (because there is no way to trace back to
* these internal filters). Therefore, memory usage can be highly
* biased depending on the filters in the upstream pipeline. The bias
@@ -1994,7 +2055,7 @@ Last-Update: 2015-12-22
* order.
*
* \ingroup OTBStreaming
-@@ -88,7 +88,7 @@
+@@ -88,7 +88,7 @@ public:
itkGetMacro(MemoryPrint, MemoryPrintType);
/** Set/Get the bias correction factor which will weight the
@@ -2003,9 +2064,9 @@ Last-Update: 2015-12-22
* estimated and real memory print, default is 1., i.e. no correction) */
itkSetMacro(BiasCorrectionFactor, double);
itkGetMacro(BiasCorrectionFactor, double);
---- otb.orig/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h
-+++ otb/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h
-@@ -29,7 +29,7 @@
+--- a/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h
++++ b/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h
+@@ -29,7 +29,7 @@ namespace otb
* \brief This class acts like a StreamingImageFileWriter, but without actually
* writing data to the disk.
*
@@ -2014,9 +2075,9 @@ Last-Update: 2015-12-22
* PersitentStatisticsImageFilter in order to get the global statistics of an image.
*
* This filter is not intended to be used with classic ImageToImageFilter, though it
---- otb.orig/Modules/Core/Transform/include/otbSensorModelBase.h
-+++ otb/Modules/Core/Transform/include/otbSensorModelBase.h
-@@ -32,7 +32,7 @@
+--- a/Modules/Core/Transform/include/otbSensorModelBase.h
++++ b/Modules/Core/Transform/include/otbSensorModelBase.h
+@@ -32,7 +32,7 @@ namespace otb
/** \class SensorModelBase
* \brief Base class for the sensor model projection classes.
*
@@ -2025,9 +2086,9 @@ Last-Update: 2015-12-22
* in the sensor geometry. (lat, lon) -> (i, j) ou (lat, lon, h) -> (i, j)
*
* \ingroup Projection
---- otb.orig/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.h
-+++ otb/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.h
-@@ -35,7 +35,7 @@
+--- a/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.h
++++ b/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.h
+@@ -35,7 +35,7 @@ namespace otb
/** \class StandardMetaImageFunctionBuilder
* \brief Build a Standard MetaImageFunction
*
@@ -2036,9 +2097,9 @@ Last-Update: 2015-12-22
* ImageFunctions:
* - otbRadiometricMomentsImageFunction
* - otbFlusserMomentsImageFunction
---- otb.orig/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.h
-+++ otb/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.h
-@@ -33,11 +33,11 @@
+--- a/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.h
++++ b/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.h
+@@ -33,11 +33,11 @@ namespace otb
/** \class PersistentVectorizationImageFilter
* \brief Perform vectorization in a persistent way.
*
@@ -2054,20 +2115,23 @@ Last-Update: 2015-12-22
*
* \sa PersistentImageFilter
*
---- otb.orig/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h
-+++ otb/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h
-@@ -58,7 +58,7 @@
+--- a/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h
++++ b/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h
+@@ -56,9 +56,9 @@ namespace otb
+ * are sorted by increasing correlation. If number of bands is
+ * different, the change maps are sorted by decreasing correlation.
*
- * The GetV1() and GetV2() methods allow to retrieve the linear
+- * The GetV1() and GetV2() methods allow to retrieve the linear
++ * The GetV1() and GetV2() methods allow retrieving the linear
* combinations used to generate the Mad change maps as a vnl_matrix of
- * double, and the GetRho() method allows to retrieve the correlation
+ * double, and the GetRho() method allows retrieving the correlation
* associated to each Mad change maps as a vnl_vector.
*
* This filter has been implemented from the Matlab code kindly made
---- otb.orig/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.h
-+++ otb/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.h
-@@ -31,7 +31,7 @@
+--- a/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.h
++++ b/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.h
+@@ -31,7 +31,7 @@ namespace otb
{
/** \class GaborFilterGenerator
@@ -2076,9 +2140,9 @@ Last-Update: 2015-12-22
* in a linear buffer of type itk::Array returned by the GetFilter() method.
*
* When calling the GetFilter() method, if the filter has to be regenerated, it will be
---- otb.orig/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h
-+++ otb/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h
-@@ -45,9 +45,9 @@
+--- a/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h
++++ b/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h
+@@ -45,9 +45,9 @@ namespace otb
* variance. Though the inverse transform can be computed, this filter
* only provides the forward transform for now.
*
@@ -2090,9 +2154,9 @@ Last-Update: 2015-12-22
*
* This filter has been implemented from the Matlab code kindly made
* available by the authors here:
---- otb.orig/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h
-+++ otb/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h
-@@ -140,7 +140,7 @@
+--- a/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h
++++ b/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h
+@@ -140,7 +140,7 @@ private:
/** \class StreamingInnerProductVectorImageFilter
* \brief This class streams the whole input image through the PersistentStatisticsImageFilter.
*
@@ -2101,9 +2165,9 @@ Last-Update: 2015-12-22
* Reset() method of the PersistentStatisticsImageFilter before streaming the image and the
* Synthetize() method of the PersistentStatisticsImageFilter after having streamed the image
* to compute the statistics. The accessor on the results are wrapping the accessors of the
---- otb.orig/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.h
-+++ otb/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.h
-@@ -187,7 +187,7 @@
+--- a/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.h
++++ b/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.h
+@@ -187,7 +187,7 @@ private:
/** \class StreamingMatrixTransposeMatrixImageFilter
* \brief This class streams the whole input image through the PersistentMatrixTransposeMatrixImageFilter.
*
@@ -2112,9 +2176,9 @@ Last-Update: 2015-12-22
* first order global statistics of this image. It calls the Reset() method of the
* PersistentMatrixTransposeMatrixImageFilter before streaming the image and the
* Synthetize() method of the PersistentMatrixTransposeMatrixImageFilter after having streamed the image
---- otb.orig/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.h
-+++ otb/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.h
-@@ -35,12 +35,12 @@
+--- a/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.h
++++ b/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.h
+@@ -35,12 +35,12 @@ namespace otb
* by setting a transform. The filter computes a displacement
* grid using the transform set and used it to warp the input.
*
@@ -2130,8 +2194,8 @@ Last-Update: 2015-12-22
* the interpolator (SetInterpolator()) and the origin (SetOrigin())
* can be set using the method between brackets.
*
---- otb.orig/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.h
-+++ otb/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.h
+--- a/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.h
++++ b/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.h
@@ -23,11 +23,11 @@
namespace otb
{
@@ -2146,9 +2210,9 @@ Last-Update: 2015-12-22
* it is a 2D array containing the number of images in the horizontal
* direction and vertical direction respectively.
*
---- otb.orig/Modules/Filtering/Path/include/otbImageToEdgePathFilter.txx
-+++ otb/Modules/Filtering/Path/include/otbImageToEdgePathFilter.txx
-@@ -108,7 +108,7 @@
+--- a/Modules/Filtering/Path/include/otbImageToEdgePathFilter.txx
++++ b/Modules/Filtering/Path/include/otbImageToEdgePathFilter.txx
+@@ -108,7 +108,7 @@ ImageToEdgePathFilter<TInputImage, TOutp
it.ActivateOffset(RIGHTDOWN);
it.ActivateOffset(LEFTUP);
it.ActivateOffset(LEFTDOWN);
@@ -2157,9 +2221,9 @@ Last-Update: 2015-12-22
std::vector<typename IteratorType::OffsetType> rotation;
rotation.push_back(RIGHT);
rotation.push_back(RIGHTDOWN);
---- otb.orig/Modules/Filtering/Polarimetry/include/otbPolarimetricData.h
-+++ otb/Modules/Filtering/Polarimetry/include/otbPolarimetricData.h
-@@ -39,7 +39,7 @@
+--- a/Modules/Filtering/Polarimetry/include/otbPolarimetricData.h
++++ b/Modules/Filtering/Polarimetry/include/otbPolarimetricData.h
+@@ -39,7 +39,7 @@ typedef enum
} ArchitectureType;
/** \class PolarimetricData
@@ -2168,9 +2232,9 @@ Last-Update: 2015-12-22
*
* HH_HV_VH_VV (0), HH_HV_VV (1), HH_VH_VV (2), HH_HV(3), VH_VV (4), HH_VV (5).
*
---- otb.orig/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h
-+++ otb/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h
-@@ -33,7 +33,7 @@
+--- a/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h
++++ b/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h
+@@ -33,7 +33,7 @@ namespace otb {
* defined GCPs. Internally, it uses an ossimRpcSolver, which performs
* the estimation using the well known least-square method.
*
@@ -2179,9 +2243,9 @@ Last-Update: 2015-12-22
* metadata, if any.
*
* GCPs can be passed to the filter using one of the AddGCP method
---- otb.orig/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.h
-+++ otb/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.h
-@@ -36,7 +36,7 @@
+--- a/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.h
++++ b/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.h
+@@ -36,7 +36,7 @@ namespace otb {
*
* Tie points can be added through the AddTiePoints() method.
*
@@ -2190,9 +2254,9 @@ Last-Update: 2015-12-22
* that has been previously set.
*
* Once all the tie points have been feeded into the estimator, the
---- otb.orig/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.h
-+++ otb/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.h
-@@ -36,7 +36,7 @@
+--- a/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.h
++++ b/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.h
+@@ -36,7 +36,7 @@ namespace otb {
* to estimate a proper RPC sensor model, there are no warning when
* the model estimated is inaccurate.
*
@@ -2201,9 +2265,9 @@ Last-Update: 2015-12-22
* metadata, if any.(TODO)
*
* GCPs can be passed to the filter using one of the AddGCP method
---- otb.orig/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.h
-+++ otb/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.h
-@@ -408,7 +408,7 @@
+--- a/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.h
++++ b/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.h
+@@ -408,7 +408,7 @@ private:
* SetSpatialBandwidth()) and within a spectral range (set using
* SetRangeBandwidth()). The resulting filtered image can be retrieved by
* GetOutput() or GetRangeOutput(). Parameter SetRangeBandwidthRamp()
@@ -2212,7 +2276,7 @@ Last-Update: 2015-12-22
* each channel if set greater than 0 (default value is 0).
*
* There are additional output images, as explained below.
-@@ -544,7 +544,7 @@
+@@ -544,7 +544,7 @@ public:
itkGetConstReferenceMacro(BucketOptimization, bool);
#endif
@@ -2221,9 +2285,9 @@ Last-Update: 2015-12-22
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 @@
+--- a/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.h
++++ b/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.h
+@@ -150,7 +150,7 @@ protected:
outputRegionForThread,
itk::ThreadIdType threadId);
@@ -2232,7 +2296,7 @@ Last-Update: 2015-12-22
* the two input images (see flag m_PhysicalSpaceCheck)
*/
virtual void VerifyInputInformation();
-@@ -172,7 +172,7 @@
+@@ -172,7 +172,7 @@ private:
/** \class StreamingCompareImageFilter
* \brief This class streams the whole input image through the PersistentCompareImageFilter.
*
@@ -2241,9 +2305,9 @@ Last-Update: 2015-12-22
* Reset() method of the PersistentCompareImageFilter before streaming the image and the
* Synthetize() method of the PersistentCompareImageFilter after having streamed the image
* to compute the estimators. The accessor on the results are wrapping the accessors of the
---- otb.orig/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h
-+++ otb/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h
-@@ -207,7 +207,7 @@
+--- a/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h
++++ b/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h
+@@ -207,7 +207,7 @@ private:
/** \class StreamingHistogramVectorImageFilter
* \brief This class streams the whole input image through the PersistentHistogramVectorImageFilter.
*
@@ -2252,9 +2316,9 @@ Last-Update: 2015-12-22
* Reset() method of the PersistentHistogramVectorImageFilter before streaming the image and the
* Synthetize() method of the PersistentHistogramVectorImageFilter after having streamed the image
* to compute the statistics. The accessor on the results are wrapping the accessors of the
---- otb.orig/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h
-+++ otb/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h
-@@ -158,7 +158,7 @@
+--- a/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h
++++ b/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h
+@@ -158,7 +158,7 @@ private:
/** \class StreamingMinMaxImageFilter
* \brief This class streams the whole input image through the PersistentMinMaxImageFilter.
*
@@ -2263,9 +2327,9 @@ Last-Update: 2015-12-22
*
* It calls the Reset() method of the PersistentMinMaxImageFilter before streaming
* the image and the Synthetize() method of the PersistentMinMaxImageFilter after
---- otb.orig/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h
-+++ otb/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h
-@@ -177,7 +177,7 @@
+--- a/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h
++++ b/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h
+@@ -177,7 +177,7 @@ private:
/** \class StreamingMinMaxVectorImageFilter
* \brief This class streams the whole input image through the PersistentMinMaxVectorImageFilter.
*
@@ -2274,9 +2338,9 @@ Last-Update: 2015-12-22
* Reset() method of the PersistentMinMaxVectorImageFilter before streaming the image and the
* Synthetize() method of the PersistentMinMaxVectorImageFilter after having streamed the image
* to compute the statistics. The accessor on the results are wrapping the accessors of the
---- otb.orig/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h
-+++ otb/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h
-@@ -196,7 +196,7 @@
+--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h
++++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h
+@@ -196,7 +196,7 @@ private:
/** \class StreamingStatisticsImageFilter
* \brief This class streams the whole input image through the PersistentStatisticsImageFilter.
*
@@ -2285,9 +2349,9 @@ Last-Update: 2015-12-22
* Reset() method of the PersistentStatisticsImageFilter before streaming the image and the
* Synthetize() method of the PersistentStatisticsImageFilter after having streamed the image
* to compute the statistics. The accessor on the results are wrapping the accessors of the
---- otb.orig/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h
-+++ otb/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h
-@@ -153,7 +153,7 @@
+--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h
++++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h
+@@ -153,7 +153,7 @@ private:
*
* This class streams the whole input image through the PersistentStreamingStatisticsMapFromLabelImageFilter.
*
@@ -2296,9 +2360,9 @@ Last-Update: 2015-12-22
* It calls the Reset() method of the PersistentStatisticsImageFilter before streaming
* the image and the Synthetize() method of the PersistentStatisticsImageFilter
* after having streamed the image to compute the statistics.
---- otb.orig/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h
-+++ otb/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h
-@@ -252,7 +252,7 @@
+--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h
++++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h
+@@ -252,7 +252,7 @@ private:
/** \class StreamingStatisticsVectorImageFilter
* \brief This class streams the whole input image through the PersistentStatisticsImageFilter.
*
@@ -2307,9 +2371,9 @@ Last-Update: 2015-12-22
* Reset() method of the PersistentStreamingStatisticsVectorImageFilter before streaming the image and the
* Synthetize() method of the PersistentStreamingStatisticsVectorImageFilter after having streamed the image
* to compute the statistics. The accessor on the results are wrapping the accessors of the
---- otb.orig/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h
-+++ otb/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h
-@@ -127,7 +127,7 @@
+--- a/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h
++++ b/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h
+@@ -127,7 +127,7 @@ private:
/** \class VectorImageToMatrixImageFilter
* \brief This class streams the whole input image through the PersistentStatisticsImageFilter.
*
@@ -2318,9 +2382,9 @@ Last-Update: 2015-12-22
* Reset() method of the PersistentStatisticsImageFilter before streaming the image and the
* Synthetize() method of the PersistentStatisticsImageFilter after having streamed the image
* to compute the statistics. The accessor on the results are wrapping the accessors of the
---- otb.orig/Modules/IO/Carto/include/otbMapFileProductWriter.h
-+++ otb/Modules/IO/Carto/include/otbMapFileProductWriter.h
-@@ -46,7 +46,7 @@
+--- a/Modules/IO/Carto/include/otbMapFileProductWriter.h
++++ b/Modules/IO/Carto/include/otbMapFileProductWriter.h
+@@ -46,7 +46,7 @@ namespace otb
* on the disk.
*
* This filter begins by tiling the input image. An accessor
@@ -2329,9 +2393,9 @@ Last-Update: 2015-12-22
* generated, an entry is added to the shapefile to store the location
* where the file is saved on the disk.
* The product generated are a mapfile wich is the configuration file
---- otb.orig/Modules/IO/ImageIO/include/otbImageFileWriter.txx
-+++ otb/Modules/IO/ImageIO/include/otbImageFileWriter.txx
-@@ -682,7 +682,7 @@
+--- a/Modules/IO/ImageIO/include/otbImageFileWriter.txx
++++ b/Modules/IO/ImageIO/include/otbImageFileWriter.txx
+@@ -682,7 +682,7 @@ ImageFileWriter<TInputImage>
this->ReleaseInputs();
//Reset global shift on input region (box parameter)
@@ -2340,9 +2404,9 @@ Last-Update: 2015-12-22
m_ShiftOutputIndex.Fill(0);
}
---- otb.orig/Modules/Learning/DempsterShafer/include/otbMassOfBelief.h
-+++ otb/Modules/Learning/DempsterShafer/include/otbMassOfBelief.h
-@@ -57,20 +57,20 @@
+--- a/Modules/Learning/DempsterShafer/include/otbMassOfBelief.h
++++ b/Modules/Learning/DempsterShafer/include/otbMassOfBelief.h
+@@ -57,26 +57,26 @@ namespace otb
* retrieved using the GetMass method. If no mass has been associated
* with this element, null is returned.
*
@@ -2369,9 +2433,16 @@ Last-Update: 2015-12-22
* two mass functions will share the exact same universe and
* power-set, but is not mandatory, since mass is supposed to be null
* for any set if not stated otherwise.
---- otb.orig/Modules/Learning/SVMLearning/include/otbSVMCrossValidationCostFunction.h
-+++ otb/Modules/Learning/SVMLearning/include/otbSVMCrossValidationCostFunction.h
-@@ -27,7 +27,7 @@
+ *
+ * Once masses are set, the GetPlausibility() and GetBelief()
+- * function allow to compute the belief and plausibility for an
++ * function allow computing the belief and plausibility for an
+ * element of the power-set, or directly for a set of elements of the
+ * power-set intersecting (resp. contained in) a given hypothesis.
+ *
+--- a/Modules/Learning/SVMLearning/include/otbSVMCrossValidationCostFunction.h
++++ b/Modules/Learning/SVMLearning/include/otbSVMCrossValidationCostFunction.h
+@@ -27,7 +27,7 @@ namespace otb
/** \class SVMCrossValidationCostFunction
* \brief This function returns the cross validation accuracy of a SVM model.
*
@@ -2380,9 +2451,9 @@ Last-Update: 2015-12-22
* accuracy using ITK optimizers.
*
* Given an input SVM model, the number of parameters depends on the
---- otb.orig/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericCorrectionParameters.h
-+++ otb/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericCorrectionParameters.h
-@@ -143,7 +143,7 @@
+--- a/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericCorrectionParameters.h
++++ b/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericCorrectionParameters.h
+@@ -143,7 +143,7 @@ protected:
private:
AtmosphericCorrectionParameters(const Self &); //purposely not implemented
void operator =(const Self&); //purposely not implemented
@@ -2391,9 +2462,9 @@ Last-Update: 2015-12-22
std::string m_AeronetFileName;
/** Day */
int m_Day;
---- otb.orig/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h
-+++ otb/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h
-@@ -128,7 +128,7 @@
+--- a/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h
++++ b/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h
+@@ -128,7 +128,7 @@ private:
/** \class SurfaceAdjacencyEffectCorrectionSchemeFilter
* \brief Correct the scheme taking care of the surrounding pixels.
*
@@ -2402,9 +2473,18 @@ Last-Update: 2015-12-22
* reflectance estimation. The satelite signal is considered as to be a combinaison of the signal coming from
* the target pixel and a weighting of the siganls coming from the neighbor pixels.
*
---- otb.orig/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.h
-+++ otb/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.h
-@@ -58,7 +58,7 @@
+--- a/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.h
++++ b/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.h
+@@ -36,7 +36,7 @@ namespace otb
+ * is defined by SetSearchRadius() method.
+ *
+ * To do so, it optimizes a metric set using the SetMetric() method, which accepts any itk metric
+- * deriving from the itk::ImageToImageMetric. The MinimizeOn()/MinimizeOff() flag allow to search for
++ * deriving from the itk::ImageToImageMetric. The MinimizeOn()/MinimizeOff() flag allows searching for
+ * minimum or maximum depending on the metric (default is On).
+ *
+ * Once a coarse (pixel wise) offset has been found, this match is further refined using dichotomic search
+@@ -58,7 +58,7 @@ namespace otb
* grid step to value higher than 1 (grid step is expressed in terms of number of fixed image pixels).
* Default value is 1.
*
@@ -2413,9 +2493,9 @@ Last-Update: 2015-12-22
*
* \example DisparityMap/FineRegistrationImageFilterExample.cxx
*
---- otb.orig/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.h
-+++ otb/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.h
-@@ -268,7 +268,7 @@
+--- a/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.h
++++ b/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.h
+@@ -268,7 +268,7 @@ private:
* between the two input images (displacement is given in pixels, from left
* image to right image).
*
@@ -2424,9 +2504,9 @@ Last-Update: 2015-12-22
* either left or right image. Left and right masks can be used independently.
* If masks are used, only pixels whose mask values are strictly positive
* will be considered for disparity matching. The other will exhibit a null
---- otb.orig/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.h
-+++ otb/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.h
-@@ -43,23 +43,23 @@
+--- a/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.h
++++ b/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.h
+@@ -43,23 +43,23 @@ namespace otb
* map.
*
* Setting-up the elevation exploration range is simple : the
@@ -2457,9 +2537,9 @@ Last-Update: 2015-12-22
* variance is too small to yeld reliable correlation. If the
* variance of the current master patch lies bellow this threshold, no
* elevation exploration is performed at this location (default is 4).
---- otb.orig/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.h
-+++ otb/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.h
-@@ -43,8 +43,8 @@
+--- a/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.h
++++ b/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.h
+@@ -43,8 +43,8 @@ namespace otb
* pairs so that the displacement related to the elevation only
* occurs in the horizontal direction (i.e. epipolar lines are
* horizontal). This operation is useful for mainly two reasons: it
@@ -2470,7 +2550,7 @@ Last-Update: 2015-12-22
*
* This filter allows you to compute the deformation fields up to the
* sensor model precision needed to warp a pair of stereo images into
-@@ -66,13 +66,13 @@
+@@ -66,13 +66,13 @@ namespace otb
* hypothesis on which the epipolar geometry is built. It means that
* any pair of pixels in the stereo pair whose elevation is exactly
* equal to the average elevation will have a null disparity (no
@@ -2487,9 +2567,18 @@ Last-Update: 2015-12-22
* resampling grid. Please keep in mind that the whole grid is loaded
* into memory, and that the epipolar lines direction may only vary
* smoothly. When working with large images, a coarse grid-step will
---- otb.orig/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h
-+++ otb/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h
-@@ -39,7 +39,7 @@
+@@ -107,7 +107,7 @@ public:
+ typedef typename OutputImageType::RegionType RegionType;
+
+ // 3D RS transform
+- // TODO: Allow to tune precision (i.e. double or float)
++ // TODO: Allow tuning precision (i.e. double or float)
+ typedef otb::GenericRSTransform<double,3,3> RSTransformType;
+ typedef typename RSTransformType::Pointer RSTransformPointerType;
+
+--- a/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h
++++ b/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h
+@@ -39,7 +39,7 @@ namespace otb
* - P1 and P2 are on different side of the streaming line
* - P1 and P2 intersect each other.
* - P2 has the largest intersection with P1 among all other polygons Pi intersecting P1.
@@ -2498,9 +2587,18 @@ Last-Update: 2015-12-22
* and their pixel coordinates.
* The input image is used to transform pixel coordinates of the streaming lines into
* coordinate system of the image, which must be the same as the one in the OGR input file.
---- otb.orig/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h
-+++ otb/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h
-@@ -29,7 +29,7 @@
+@@ -134,7 +134,7 @@ protected:
+ void ProcessStreamingLine(bool line, itk::ProgressReporter &progress);
+ /** get length in case of OGRGeometryCollection.
+ * This function recodes the get_lenght method available since gdal 1.8.0
+- * in the case of OGRGeometryCollection. The aim is allow to access polygon stiching
++ * in the case of OGRGeometryCollection. The aim is to allow accessing polygon stiching
+ * functionalities with gdal 1.6.
+ */
+ double GetLengthOGRGeometryCollection(OGRGeometryCollection * intersection);
+--- a/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h
++++ b/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h
+@@ -29,7 +29,7 @@ namespace otb {
* \brief Watershed composite filter allowing to set output type
*
* This filter is a composite filter that encapsulates the
@@ -2509,9 +2607,9 @@ Last-Update: 2015-12-22
* image (which is not the case in the itk::WatershedImageFilter).
*
* The composite filter internally casts the output from the
---- otb.orig/Modules/Wrappers/ApplicationEngine/src/otbWrapperElevationParametersHandler.cxx
-+++ otb/Modules/Wrappers/ApplicationEngine/src/otbWrapperElevationParametersHandler.cxx
-@@ -28,14 +28,14 @@
+--- a/Modules/Wrappers/ApplicationEngine/src/otbWrapperElevationParametersHandler.cxx
++++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperElevationParametersHandler.cxx
+@@ -28,14 +28,14 @@ void ElevationParametersHandler::AddElev
{
app->AddParameter(ParameterType_Group, key, "Elevation management");
app->SetParameterDescription(key,
@@ -2528,7 +2626,7 @@ Last-Update: 2015-12-22
app->MandatoryOff(oss.str());
std::string demDirFromConfig = otb::ConfigurationManager::GetDEMDirectory();
-@@ -73,7 +73,7 @@
+@@ -73,7 +73,7 @@ void ElevationParametersHandler::AddElev
oss.str("");
oss << key <<".default";
app->AddParameter(ParameterType_Float, oss.str(), "Default elevation");
@@ -2537,9 +2635,9 @@ Last-Update: 2015-12-22
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 @@
+--- a/Modules/Wrappers/ApplicationEngine/src/otbWrapperMapProjectionParametersHandler.cxx
++++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperMapProjectionParametersHandler.cxx
+@@ -41,7 +41,7 @@ void MapProjectionParametersHandler::Add
oss << ".zone";
app->AddParameter(ParameterType_Int, oss.str(), "Zone number");
@@ -2548,7 +2646,7 @@ Last-Update: 2015-12-22
app->SetMinimumParameterIntValue(oss.str(), 1);
app->SetDefaultParameterInt(oss.str(), 31);
-@@ -99,7 +99,7 @@
+@@ -99,7 +99,7 @@ void MapProjectionParametersHandler::Add
oss<<key<<".epsg";
app->AddChoice(oss.str(),"EPSG Code");
app->SetParameterDescription(oss.str(),
@@ -2557,18 +2655,21 @@ Last-Update: 2015-12-22
oss <<".code";
app->AddParameter(ParameterType_Int, oss.str(), "EPSG Code");
---- otb.orig/RELEASE_NOTES.txt
-+++ otb/RELEASE_NOTES.txt
-@@ -118,7 +118,7 @@
+--- a/RELEASE_NOTES.txt
++++ b/RELEASE_NOTES.txt
+@@ -118,9 +118,9 @@ OTB-v.5.0.0 - Changes since version 4.4.
* Superbuild
* A separate superbuild project has been added in the Superbuild repository
- * It allows to build all OTB dependencies from source, and then OTB (thus replaces the removed internal versions)
+ * It allows building all OTB dependencies from source, and then OTB (thus replaces the removed internal versions)
* Sources are checked out at configuration time or can be downloaded beforehand
- * Allow to build a complete OTB with a handful of prerequisites (gcc, cmake, curl)
+- * Allow to build a complete OTB with a handful of prerequisites (gcc, cmake, curl)
++ * Allow building a complete OTB with a handful of prerequisites (gcc, cmake, curl)
-@@ -169,7 +169,7 @@
+ * Doxygen
+ * Classes are now organized by modules
+@@ -169,7 +169,7 @@ OTB-v.5.0.0 - Changes since version 4.4.
* 0001037: file and vector outputs need explicit relative paths
* 0001036: TileFusion application crashes with SPOT-7 tiled images
* 0000728: Inconsistent polygon number in concatenate vector data output
@@ -2577,7 +2678,7 @@ Last-Update: 2015-12-22
OTB-v.4.4.0 - Changes since version 4.2.1 (2015/02/13)
-@@ -481,13 +481,13 @@
+@@ -481,13 +481,13 @@ OTB-v.3.20 - Changes since version 3.18.
* 0000770: Output parameter does not appear anymore in the command line helper
* 0000798: All the OTB app parameters are not all saved into the xml output file
* 0000779: [OTB]otbTrainImagesClassifier generates an output *.CSV confusion matrix with a wrong header
@@ -2593,7 +2694,7 @@ Last-Update: 2015-12-22
* 0000803: otbApplicationLauncherCommandLine -inxml parameter does not retrieve pixel type for output image parameter
* 0000736: Error setting the index in RadiometricIndices application via python
* 0000800: Watershed mode of segmentation application produce an image without CRS even if the input image has one
-@@ -570,7 +570,7 @@
+@@ -570,7 +570,7 @@ The full list of improvements comes here
* DisparityMapTo3DFilter : convert disparity map in epipolar geometry to 3D image in epipolar geometry
* MultiDisparityMapTo3DFilter : convert several disparity maps in sensor geometry to a 3D image in sensor geometry
* LineOfSightOptimizer : algorithm to fuse several elevation values by line of sight optimisation
@@ -2602,7 +2703,7 @@ Last-Update: 2015-12-22
* Multi3DToDEMFilter : fuse several 3D images to produce an elevation map
* DisparityTranslateFilter : filter to translate epipolar disparities into sensor disparities
* PixelWiseBlockMatchingImageFilter : fix initialisation of metric and disparities
-@@ -998,7 +998,7 @@
+@@ -998,7 +998,7 @@ OTB-v.3.14.0 - Changes since version 3.1
* Add image origin to ReadImageInfoApplication
* Use now InputFilenameParameter and OutputFilenameParameter instead
of FilenameParameter
@@ -2611,7 +2712,7 @@ Last-Update: 2015-12-22
* New option in SVMClassifier application: sample.edg (non mandatory)
to manage special cases with small samples
* In KMeansClassification, Changing the random intialisation method
-@@ -2017,7 +2017,7 @@
+@@ -2017,7 +2017,7 @@ OTB-v.2.6.0 - Changes since version 2.4.
OTB-v.2.4.0 - Changes since version 2.2.0 (2008/07/24)
--------------------------------------------------------
@@ -2620,7 +2721,7 @@ Last-Update: 2015-12-22
not only examples testing
- Added OTB_USE_JPEG2000 : experimental support for jpeg2000
files.
-@@ -2354,7 +2354,7 @@
+@@ -2354,7 +2354,7 @@ OTB-v.1.6.0 - Changes since version 1.4.
- Added a new tiling streaming mode.
@@ -2629,7 +2730,7 @@ Last-Update: 2015-12-22
seamlessly
the image geometry information.
-@@ -2438,16 +2438,16 @@
+@@ -2438,16 +2438,16 @@ OTB-v.1.6.0 - Changes since version 1.4.
*Applications:
@@ -2650,9 +2751,9 @@ Last-Update: 2015-12-22
command line using the brand new Projections module of the Orfeo
ToolBox. Old rigid
orthoo rectification application has been moved to
---- otb.orig/Utilities/Doxygen/OTB/ImageSimilarityMetrics.dox
-+++ otb/Utilities/Doxygen/OTB/ImageSimilarityMetrics.dox
-@@ -37,7 +37,7 @@
+--- a/Utilities/Doxygen/OTB/ImageSimilarityMetrics.dox
++++ b/Utilities/Doxygen/OTB/ImageSimilarityMetrics.dox
+@@ -37,7 +37,7 @@ Unfortunately there are no clear rules a
Metrics are depend on the objects they compare. The toolkit currently offers <em> Image To Image </em> and <em> PointSet to Image </em> metrics as follows:
\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.
@@ -2661,9 +2762,18 @@ Last-Update: 2015-12-22
\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 @@
+--- a/Utilities/Doxygen/OTB/Registration.dox
++++ b/Utilities/Doxygen/OTB/Registration.dox
+@@ -10,7 +10,7 @@ particular transformation.
+ A typical example of registration is to have two medical images
+ from the same patient taken at different dates. It is very likely
+ that the patient assume a different position during each acquisition.
+-A registration procedure would allow to take both images and find
++A registration procedure would allow taking both images and find
+ a spatial transformation to find the corresponding pixel from one
+ image into the other.
+
+@@ -75,7 +75,7 @@ Unfortunately there are no clear rules a
Metrics are depend on the objects they compare. The toolkit currently offers <em> Image To Image </em> and <em> PointSet to Image </em> metrics as follows:
\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.
@@ -2672,9 +2782,9 @@ Last-Update: 2015-12-22
\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 @@
+--- a/Examples/Projections/GeometriesProjectionExample.cxx
++++ b/Examples/Projections/GeometriesProjectionExample.cxx
+@@ -140,7 +140,7 @@ int main(int argc, char* argv[])
// not stored in a file nor a data base.
//
// Then, the processing is started by calling \code{Update()}. The actual
@@ -2683,9 +2793,9 @@ Last-Update: 2015-12-22
// geometries set object goes out of scope, or when \code{SyncToDisk} is
// called.
//
---- otb.orig/Modules/Adapters/OSSIMAdapters/src/otbDEMConvertAdapter.cxx
-+++ otb/Modules/Adapters/OSSIMAdapters/src/otbDEMConvertAdapter.cxx
-@@ -140,7 +140,7 @@
+--- a/Modules/Adapters/OSSIMAdapters/src/otbDEMConvertAdapter.cxx
++++ b/Modules/Adapters/OSSIMAdapters/src/otbDEMConvertAdapter.cxx
+@@ -140,7 +140,7 @@ int DEMConvertAdapter::Convert(std::stri
{
std::cerr << "std::exception thrown:" << std::endl;
std::cerr << e.what() << std::endl;
@@ -2694,9 +2804,9 @@ Last-Update: 2015-12-22
return EXIT_FAILURE;
}
}
---- otb.orig/Modules/Filtering/Projection/test/otbGenericRSResampleImageFilter.cxx
-+++ otb/Modules/Filtering/Projection/test/otbGenericRSResampleImageFilter.cxx
-@@ -81,7 +81,7 @@
+--- a/Modules/Filtering/Projection/test/otbGenericRSResampleImageFilter.cxx
++++ b/Modules/Filtering/Projection/test/otbGenericRSResampleImageFilter.cxx
+@@ -81,7 +81,7 @@ int otbGenericRSResampleImageFilter(int
spacing[0] = 0.6;
spacing[1] = -0.6;
@@ -2705,9 +2815,9 @@ Last-Update: 2015-12-22
OGRSpatialReference oSRS;
oSRS.SetProjCS("UTM");
oSRS.SetUTM(31, true);
---- otb.orig/Modules/IO/IOGDAL/test/otbMultiDatasetReadingInfo.cxx
-+++ otb/Modules/IO/IOGDAL/test/otbMultiDatasetReadingInfo.cxx
-@@ -27,7 +27,7 @@
+--- a/Modules/IO/IOGDAL/test/otbMultiDatasetReadingInfo.cxx
++++ b/Modules/IO/IOGDAL/test/otbMultiDatasetReadingInfo.cxx
+@@ -27,7 +27,7 @@ int otbMultiDatasetReadingInfo(int argc,
{
if (argc != 3)
{
@@ -2716,9 +2826,9 @@ Last-Update: 2015-12-22
return EXIT_FAILURE;
}
const char * inputFilename = argv[1];
---- otb.orig/Modules/IO/ImageIO/test/otbMultiResolutionReadingInfo.cxx
-+++ otb/Modules/IO/ImageIO/test/otbMultiResolutionReadingInfo.cxx
-@@ -29,7 +29,7 @@
+--- a/Modules/IO/ImageIO/test/otbMultiResolutionReadingInfo.cxx
++++ b/Modules/IO/ImageIO/test/otbMultiResolutionReadingInfo.cxx
+@@ -29,7 +29,7 @@ int otbMultiResolutionReadingInfo(int ar
{
if (argc != 3)
{
@@ -2727,9 +2837,9 @@ Last-Update: 2015-12-22
return EXIT_FAILURE;
}
const char * inputFilename = argv[1];
---- otb.orig/Modules/Registration/DisparityMap/test/otbDisparityMapToDEMFilter.cxx
-+++ otb/Modules/Registration/DisparityMap/test/otbDisparityMapToDEMFilter.cxx
-@@ -61,7 +61,7 @@
+--- a/Modules/Registration/DisparityMap/test/otbDisparityMapToDEMFilter.cxx
++++ b/Modules/Registration/DisparityMap/test/otbDisparityMapToDEMFilter.cxx
+@@ -61,7 +61,7 @@ int otbDisparityMapToDEMFilter(int argc,
std::cerr
<< " dispinput_fname sensorleftinput_fname sensorrighttinput_fname gridleftinput_fname gridrightinput_fname"
<< std::endl;
@@ -2738,9 +2848,9 @@ Last-Update: 2015-12-22
std::cerr << " elevmin elevmax avgelev DEMgridstep (maskinput_fname) " << std::endl;
return EXIT_FAILURE;
}
---- otb.orig/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.h
-+++ otb/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.h
-@@ -54,14 +54,14 @@
+--- a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.h
++++ b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.h
+@@ -54,14 +54,14 @@ namespace otb
*
* \ingroup OTBMorphologicalProfiles
*/
@@ -2758,7 +2868,7 @@ Last-Update: 2015-12-22
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
-@@ -69,7 +69,7 @@
+@@ -69,7 +69,7 @@ typedef itk::SmartPointer<const Self> Co
/** Some convenient typedefs. */
typedef TInputImage InputImageType;
typedef typename InputImageType::PixelType InputPixelType;
@@ -2767,8 +2877,8 @@ Last-Update: 2015-12-22
typedef otb::Image<TInternalPrecision> InternalImageType;
typedef TStructuringElement StructuringElementType;
---- otb.orig/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.txx
-+++ otb/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.txx
+--- a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.txx
++++ b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.txx
@@ -23,8 +23,8 @@
namespace otb
{
@@ -2780,7 +2890,7 @@ Last-Update: 2015-12-22
::MorphologicalProfilesSegmentationFilter()
{
m_ProfileSize = 5;
-@@ -54,14 +54,14 @@
+@@ -54,14 +54,14 @@ MorphologicalProfilesSegmentationFilter<
}
@@ -2799,9 +2909,9 @@ Last-Update: 2015-12-22
::GenerateData()
{
m_OpeningProfile->SetInput(this->GetInput());
---- otb.orig/Modules/Wrappers/CommandLine/src/CMakeLists.txt
-+++ otb/Modules/Wrappers/CommandLine/src/CMakeLists.txt
-@@ -16,7 +16,7 @@
+--- a/Modules/Wrappers/CommandLine/src/CMakeLists.txt
++++ b/Modules/Wrappers/CommandLine/src/CMakeLists.txt
+@@ -16,7 +16,7 @@ target_link_libraries(otbApplicationLaun
otb_module_target(otbApplicationLauncherCommandLine)
# Where we will install the script in the build tree
@@ -2810,7 +2920,7 @@ Last-Update: 2015-12-22
# 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 @@
+@@ -27,11 +27,11 @@ configure_file( ${CMAKE_SOURCE_DIR}/CMak
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/otbcli.bat
@ONLY )
file(COPY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/otbcli.bat
@@ -2824,7 +2934,7 @@ Last-Update: 2015-12-22
DESTINATION ${OTBCommandLine_INSTALL_RUNTIME_DIR}
COMPONENT Runtime)
-@@ -40,11 +40,11 @@
+@@ -40,11 +40,11 @@ configure_file( ${CMAKE_SOURCE_DIR}/CMak
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/otbcli
@ONLY )
file(COPY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/otbcli
@@ -2838,9 +2948,9 @@ Last-Update: 2015-12-22
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 @@
+--- a/Modules/Wrappers/QtWidget/src/CMakeLists.txt
++++ b/Modules/Wrappers/QtWidget/src/CMakeLists.txt
+@@ -91,7 +91,7 @@ target_link_libraries(otbApplicationLaun
otb_module_target(otbApplicationLauncherQt)
# Where we will install the script in the build tree
@@ -2849,7 +2959,7 @@ Last-Update: 2015-12-22
# 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 @@
+@@ -103,11 +103,11 @@ configure_file( ${CMAKE_SOURCE_DIR}/CMak
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/otbgui.bat
@ONLY )
file(COPY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/otbgui.bat
@@ -2863,7 +2973,7 @@ Last-Update: 2015-12-22
DESTINATION ${OTBQtWidget_INSTALL_RUNTIME_DIR}
COMPONENT Runtime)
-@@ -116,11 +116,11 @@
+@@ -116,11 +116,11 @@ configure_file( ${CMAKE_SOURCE_DIR}/CMak
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/otbgui
@ONLY )
file(COPY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/otbgui
@@ -2877,9 +2987,9 @@ Last-Update: 2015-12-22
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 @@
+--- a/Modules/Detection/RoadExtraction/include/otbRemoveWrongDirectionFilter.h
++++ b/Modules/Detection/RoadExtraction/include/otbRemoveWrongDirectionFilter.h
+@@ -63,7 +63,7 @@ public:
* we can assume that the direction of a road on our scalar product image is positive (greater
* than \f$ \pi/8 \f$).
* Therefore in the input modulus and direction images, pixels whose direction is lower than
@@ -2888,9 +2998,9 @@ Last-Update: 2015-12-22
* (in fact, their intensity is set to 0).
*
* \sa NeighborhoodScalarProductFilter
---- otb.orig/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.h
-+++ otb/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.h
-@@ -31,7 +31,7 @@
+--- a/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.h
++++ b/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.h
+@@ -31,7 +31,7 @@ namespace otb
*
* This class implements an image filter which detects isolated pixels
* that have little chance of belonging to a raod and performs a pixel
@@ -2899,9 +3009,9 @@ Last-Update: 2015-12-22
* for other pixels with a direction close to \f$ \theta_i \f$ in an angular
* beam around it. If none is found, the pixel is suppressed.
*
---- otb.orig/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.txx
-+++ otb/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.txx
-@@ -107,7 +107,7 @@
+--- a/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.txx
++++ b/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.txx
+@@ -107,7 +107,7 @@ SpectralAngleDistanceImageFilter<TInputI
{
dist = vcl_acos(scalarProd / vcl_sqrt(normProd));
}
@@ -2910,9 +3020,9 @@ Last-Update: 2015-12-22
// Spectral angle normalization
// dist = dist/(CONST_PI_2);
//square ponderation
---- otb.orig/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.txx
-+++ otb/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.txx
-@@ -307,7 +307,7 @@
+--- a/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.txx
++++ b/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.txx
+@@ -307,7 +307,7 @@ DSFusionOfClassifiersImageFilter<TInputI
// Calculation of the four constants A, B, C and K
MassType A = 0, B = 1, C = 1, K;
@@ -2921,9 +3031,9 @@ Last-Update: 2015-12-22
for (itMapMOBClk = mapJointMassesStepI.begin(); itMapMOBClk != mapJointMassesStepI.end(); ++itMapMOBClk)
{
classLabelk = itMapMOBClk->first;
---- otb.orig/Modules/Wrappers/ApplicationEngine/src/otbWrapperDocExampleStructure.cxx
-+++ otb/Modules/Wrappers/ApplicationEngine/src/otbWrapperDocExampleStructure.cxx
-@@ -145,7 +145,7 @@
+--- a/Modules/Wrappers/ApplicationEngine/src/otbWrapperDocExampleStructure.cxx
++++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperDocExampleStructure.cxx
+@@ -145,7 +145,7 @@ DocExampleStructure::GenerateCLExample(
res = oss.str();
@@ -2932,9 +3042,9 @@ Last-Update: 2015-12-22
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 @@
+--- a/Modules/Wrappers/CommandLine/src/otbWrapperCommandLineParser.cxx
++++ b/Modules/Wrappers/CommandLine/src/otbWrapperCommandLineParser.cxx
+@@ -496,7 +496,7 @@ CommandLineParser::GetKeyList( const std
while( found != std::string::npos )
{
@@ -2943,9 +3053,9 @@ Last-Update: 2015-12-22
cutExp = cutExp.substr(found+2, exp.size());
// Search the end of the key (a space)
std::size_t foundSpace = cutExp.find(" ");
---- otb.orig/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputFilenameListParameter.h
-+++ otb/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputFilenameListParameter.h
-@@ -51,7 +51,7 @@
+--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputFilenameListParameter.h
++++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputFilenameListParameter.h
+@@ -51,7 +51,7 @@ protected slots:
virtual void UpFile();
virtual void DownFile();
virtual void AddFile();
@@ -2954,9 +3064,9 @@ Last-Update: 2015-12-22
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 @@
+--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputImageListParameter.h
++++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputImageListParameter.h
+@@ -51,7 +51,7 @@ protected slots:
virtual void UpFile();
virtual void DownFile();
virtual void AddFile();
@@ -2965,9 +3075,9 @@ Last-Update: 2015-12-22
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 @@
+--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputVectorDataListParameter.h
++++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputVectorDataListParameter.h
+@@ -52,7 +52,7 @@ protected slots:
virtual void UpFile();
virtual void DownFile();
virtual void AddFile();
@@ -2976,9 +3086,9 @@ Last-Update: 2015-12-22
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 @@
+--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetStringListParameter.h
++++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetStringListParameter.h
+@@ -46,7 +46,7 @@ signals:
protected slots:
void SetString( const QString& value );
virtual void AddString();
@@ -2987,9 +3097,9 @@ Last-Update: 2015-12-22
virtual void UpdateStringList();
private:
---- otb.orig/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetInputFilenameListParameter.cxx
-+++ otb/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetInputFilenameListParameter.cxx
-@@ -87,12 +87,12 @@
+--- a/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetInputFilenameListParameter.cxx
++++ b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetInputFilenameListParameter.cxx
+@@ -87,12 +87,12 @@ void QtWidgetInputFilenameListParameter:
connect(addButton, SIGNAL(clicked()), this, SLOT(AddFile()));
addSupLayout->addWidget(addButton);
@@ -3005,7 +3115,7 @@ Last-Update: 2015-12-22
addSupLayout->addWidget(supButton);
buttonLayout->addLayout(addSupLayout);
-@@ -312,7 +312,7 @@
+@@ -312,7 +312,7 @@ QtWidgetInputFilenameListParameter::AddF
}
void
@@ -3014,9 +3124,9 @@ Last-Update: 2015-12-22
{
m_FileLayout = new QVBoxLayout();
m_FileLayout->setSpacing(0);
---- otb.orig/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetInputImageListParameter.cxx
-+++ otb/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetInputImageListParameter.cxx
-@@ -89,12 +89,12 @@
+--- a/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetInputImageListParameter.cxx
++++ b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetInputImageListParameter.cxx
+@@ -89,12 +89,12 @@ void QtWidgetInputImageListParameter::Do
connect(addButton, SIGNAL(clicked()), this, SLOT(AddFile()));
addSupLayout->addWidget(addButton);
@@ -3032,7 +3142,7 @@ Last-Update: 2015-12-22
addSupLayout->addWidget(supButton);
buttonLayout->addLayout(addSupLayout);
-@@ -332,7 +332,7 @@
+@@ -332,7 +332,7 @@ QtWidgetInputImageListParameter::AddFile
}
void
@@ -3041,9 +3151,9 @@ Last-Update: 2015-12-22
{
m_FileLayout = new QVBoxLayout();
m_FileLayout->setSpacing(0);
---- otb.orig/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetInputVectorDataListParameter.cxx
-+++ otb/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetInputVectorDataListParameter.cxx
-@@ -86,12 +86,12 @@
+--- a/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetInputVectorDataListParameter.cxx
++++ b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetInputVectorDataListParameter.cxx
+@@ -86,12 +86,12 @@ void QtWidgetInputVectorDataListParamete
connect(addButton, SIGNAL(clicked()), this, SLOT(AddFile()));
addSupLayout->addWidget(addButton);
@@ -3059,7 +3169,7 @@ Last-Update: 2015-12-22
addSupLayout->addWidget(supButton);
buttonLayout->addLayout(addSupLayout);
-@@ -311,7 +311,7 @@
+@@ -311,7 +311,7 @@ QtWidgetInputVectorDataListParameter::Ad
}
void
@@ -3068,9 +3178,9 @@ Last-Update: 2015-12-22
{
m_FileLayout = new QVBoxLayout();
m_FileLayout->setSpacing(0);
---- otb.orig/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetStringListParameter.cxx
-+++ otb/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetStringListParameter.cxx
-@@ -88,12 +88,12 @@
+--- a/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetStringListParameter.cxx
++++ b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetStringListParameter.cxx
+@@ -88,12 +88,12 @@ void QtWidgetStringListParameter::DoCrea
connect( addButton, SIGNAL(clicked()), this, SLOT(AddString()) );
addSupLayout->addWidget(addButton);
@@ -3086,7 +3196,7 @@ Last-Update: 2015-12-22
addSupLayout->addWidget(supButton);
buttonLayout->addLayout(addSupLayout);
-@@ -177,7 +177,7 @@
+@@ -177,7 +177,7 @@ QtWidgetStringListParameter::AddString()
void
@@ -3095,9 +3205,9 @@ Last-Update: 2015-12-22
{
m_StringLayout = new QVBoxLayout();
m_StringLayout->setSpacing(0);
---- otb.orig/Modules/Applications/AppClassification/app/otbTrainRegression.cxx
-+++ otb/Modules/Applications/AppClassification/app/otbTrainRegression.cxx
-@@ -122,7 +122,7 @@
+--- a/Modules/Applications/AppClassification/app/otbTrainRegression.cxx
++++ b/Modules/Applications/AppClassification/app/otbTrainRegression.cxx
+@@ -122,7 +122,7 @@ void DoInit()
//Group IO
AddParameter(ParameterType_Group, "io", "Input and output data");
@@ -3106,7 +3216,7 @@ Last-Update: 2015-12-22
AddParameter(ParameterType_InputImageList, "io.il", "Input Image List");
SetParameterDescription("io.il", "A list of input images. First (n-1) bands should contain the predictor. The last band should contain the output value to predict.");
AddParameter(ParameterType_InputFilename, "io.csv", "Input CSV file");
-@@ -144,7 +144,7 @@
+@@ -144,7 +144,7 @@ void DoInit()
//Group Sample list
AddParameter(ParameterType_Group, "sample", "Training and validation samples parameters");
SetParameterDescription("sample",
@@ -3115,7 +3225,7 @@ Last-Update: 2015-12-22
AddParameter(ParameterType_Int, "sample.mt", "Maximum training predictors");
//MandatoryOff("mt");
-@@ -230,7 +230,7 @@
+@@ -230,7 +230,7 @@ void ParseCSVPredictors(std::string path
}
if (words.size() < 2)
{
@@ -3124,9 +3234,9 @@ Last-Update: 2015-12-22
}
nbCols = words.size();
elem.SetSize(nbCols,false);
---- otb.orig/Modules/Applications/AppClassification/app/otbPredictRegression.cxx
-+++ otb/Modules/Applications/AppClassification/app/otbPredictRegression.cxx
-@@ -141,7 +141,7 @@
+--- a/Modules/Applications/AppClassification/app/otbPredictRegression.cxx
++++ b/Modules/Applications/AppClassification/app/otbPredictRegression.cxx
+@@ -141,7 +141,7 @@ private:
// TODO : use CSV input/output ?
AddParameter(ParameterType_InputImage, "mask", "Input Mask");
@@ -3135,18 +3245,20 @@ Last-Update: 2015-12-22
"classification of the input image to the area where mask pixel values "
"are greater than 0.");
MandatoryOff("mask");
---- otb.orig/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx
-+++ otb/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx
-@@ -115,7 +115,7 @@
+--- a/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx
++++ b/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx
+@@ -115,8 +115,8 @@ void DoInit()
"Samples are composed of pixel values in each band optionally centered and reduced using an XML statistics file produced by "
"the ComputeImagesStatistics application.\n The training vector data must contain polygons with a positive integer field "
"representing the class label. The name of this field can be set using the \"Class label field\" parameter. Training and validation "
- "sample lists are built such that each class is equally represented in both lists. One parameter allows to control the ratio "
+- "between the number of samples in training and validation sets. Two parameters allow to manage the size of the training and "
+ "sample lists are built such that each class is equally represented in both lists. One parameter allows controlling the ratio "
- "between the number of samples in training and validation sets. Two parameters allow to manage the size of the training and "
++ "between the number of samples in training and validation sets. Two parameters allow managing the size of the training and "
"validation sets per class and per image.\n Several classifier parameters can be set depending on the chosen classifier. In the "
"validation process, the confusion matrix is organized the following way: rows = reference labels, columns = produced labels. "
-@@ -128,7 +128,7 @@
+ "In the header of the optional confusion matrix output file, the validation (reference) and predicted (produced) class labels"
+@@ -128,7 +128,7 @@ void DoInit()
//Group IO
AddParameter(ParameterType_Group, "io", "Input and output data");
@@ -3155,7 +3267,7 @@ Last-Update: 2015-12-22
AddParameter(ParameterType_InputImageList, "io.il", "Input Image List");
SetParameterDescription("io.il", "A list of input images.");
AddParameter(ParameterType_InputVectorDataList, "io.vd", "Input Vector Data List");
-@@ -149,7 +149,7 @@
+@@ -149,7 +149,7 @@ void DoInit()
//Group Sample list
AddParameter(ParameterType_Group, "sample", "Training and validation samples parameters");
SetParameterDescription("sample",
@@ -3164,9 +3276,9 @@ Last-Update: 2015-12-22
AddParameter(ParameterType_Int, "sample.mt", "Maximum training sample size per class");
//MandatoryOff("mt");
---- otb.orig/Modules/Applications/AppImageUtils/app/otbManageNoData.cxx
-+++ otb/Modules/Applications/AppImageUtils/app/otbManageNoData.cxx
-@@ -61,7 +61,7 @@
+--- a/Modules/Applications/AppImageUtils/app/otbManageNoData.cxx
++++ b/Modules/Applications/AppImageUtils/app/otbManageNoData.cxx
+@@ -61,7 +61,7 @@ private:
SetDescription("Manage No-Data");
// Documentation
SetDocName("No Data management");
@@ -3175,9 +3287,18 @@ Last-Update: 2015-12-22
SetDocLimitations("None");
SetDocAuthors("OTB-Team");
SetDocSeeAlso("BanMath");
---- otb.orig/Modules/Applications/AppSARCalibration/app/otbSarRadiometricCalibration.cxx
-+++ otb/Modules/Applications/AppSARCalibration/app/otbSarRadiometricCalibration.cxx
-@@ -49,7 +49,7 @@
+@@ -81,7 +81,7 @@ private:
+ DisableParameter("usenan");
+
+ AddParameter(ParameterType_Choice,"mode","No-data handling mode");
+- SetParameterDescription("mode","Allows to choose between different no-data handling options");
++ SetParameterDescription("mode","Allows choosing between different no-data handling options");
+
+ AddChoice("mode.buildmask","Build a no-data Mask");
+
+--- a/Modules/Applications/AppSARCalibration/app/otbSarRadiometricCalibration.cxx
++++ b/Modules/Applications/AppSARCalibration/app/otbSarRadiometricCalibration.cxx
+@@ -49,7 +49,7 @@ private:
// Documentation
SetDocName("SAR Radiometric calibration");
@@ -3186,9 +3307,9 @@ Last-Update: 2015-12-22
SetDocLimitations("None");
SetDocAuthors("OTB-Team");
SetDocSeeAlso(" ");
---- otb.orig/Modules/Applications/AppSARDecompositions/app/otbSARDecompositions.cxx
-+++ otb/Modules/Applications/AppSARDecompositions/app/otbSARDecompositions.cxx
-@@ -111,7 +111,7 @@
+--- a/Modules/Applications/AppSARDecompositions/app/otbSARDecompositions.cxx
++++ b/Modules/Applications/AppSARDecompositions/app/otbSARDecompositions.cxx
+@@ -111,7 +111,7 @@ private:
SetParameterDescription("decomp.haa","H-alpha-A decomposition");
AddParameter(ParameterType_Group,"inco","Incoherent decompositions");
@@ -3197,8 +3318,8 @@ Last-Update: 2015-12-22
AddParameter(ParameterType_Int, "inco.kernelsize", "Kernel size for spatial incoherent averaging.");
SetParameterDescription("inco.kernelsize", "Minute (0-59)");
---- otb.orig/Modules/Wrappers/SWIG/src/numpy.i
-+++ otb/Modules/Wrappers/SWIG/src/numpy.i
+--- a/Modules/Wrappers/SWIG/src/numpy.i
++++ b/Modules/Wrappers/SWIG/src/numpy.i
@@ -123,7 +123,7 @@
if (PyInstance_Check(py_obj)) return "instance" ;
%#endif
@@ -3208,3 +3329,535 @@ Last-Update: 2015-12-22
}
/* Given a NumPy typecode, return a string describing the type.
+--- a/Copyright/ITKCopyright.txt
++++ b/Copyright/ITKCopyright.txt
+@@ -17,7 +17,7 @@ of Health. ITK is partially derived from
+ copyrighted accordingly (see VTKCopyright.txt and VXLCopyright.txt).
+
+ The copyright of most of the files in the "Utilities" subdirectory is held by
+-third parties who allow to distribute this material under a license compatible
++third parties who allow distributing this material under a license compatible
+ with the one used by ITK. Please read the content of the subdirectories for
+ specific details on those third-party licenses. You will also find details in
+ the README.txt file under the "Copyright" subdirectory.
+--- a/Examples/DataRepresentation/Image/ImageListExample.cxx
++++ b/Examples/DataRepresentation/Image/ImageListExample.cxx
+@@ -135,8 +135,8 @@ int main(int itkNotUsed(argc), char * ar
+ //
+ // Other useful methods are:
+ // \begin{itemize}
+-// \item \code{SetNthElement()} and \code{GetNthElement()} allow to
+-// randomly access any element of the list.
++// \item \code{SetNthElement()} and \code{GetNthElement()} allow
++// randomly accessing any element of the list.
+ // \item \code{Front()} to access to the first element of the list.
+ // \item \code{Erase()} to remove an element.
+ // \end{itemize}
+--- a/Examples/FeatureExtraction/AssymmetricFusionOfLineDetectorExample.cxx
++++ b/Examples/FeatureExtraction/AssymmetricFusionOfLineDetectorExample.cxx
+@@ -180,7 +180,7 @@ int main(int argc, char * argv[])
+ // Software Guide : BeginLatex
+ //
+ // The methods \code{SetLengthLine()} and \code{SetWidthLine()}
+- // allow to set the minimum length and the typical witdh of the
++ // allow setting the minimum length and the typical witdh of the
+ // lines which are to be detected.
+ //
+ // \index{otb::AssymetricFusionOfDetector!SetWidthLine()}
+--- a/Examples/FeatureExtraction/CorrelationLineDetectorExample.cxx
++++ b/Examples/FeatureExtraction/CorrelationLineDetectorExample.cxx
+@@ -185,7 +185,7 @@ int main(int argc, char * argv[])
+ // Software Guide : BeginLatex
+ //
+ // The methods \code{SetLengthLine()} and \code{SetWidthLine()}
+- // allow to set the minimum length and the typical witdh of the
++ // allow setting the minimum length and the typical witdh of the
+ // lines which are to be detected.
+ //
+ // \index{otb::LineCorrelationDetector!SetWidthLine()}
+--- a/Examples/FeatureExtraction/ExtractSegmentsByStepsExample.cxx
++++ b/Examples/FeatureExtraction/ExtractSegmentsByStepsExample.cxx
+@@ -194,7 +194,7 @@ int main(int argc, char * argv[])
+ // Software Guide : BeginLatex
+ //
+ // The methods \code{SetLengthLine()} and \code{SetWidthLine()}
+- // allow to set the minimum length and the typical witdh of the
++ // allow setting the minimum length and the typical witdh of the
+ // lines which are to be detected.
+ //
+ //
+--- a/Examples/FeatureExtraction/ExtractSegmentsExample.cxx
++++ b/Examples/FeatureExtraction/ExtractSegmentsExample.cxx
+@@ -191,7 +191,7 @@ int main(int argc, char * argv[])
+ // Software Guide : BeginLatex
+ //
+ // The methods \code{SetLengthLine()} and \code{SetWidthLine()}
+- // allow to set the minimum length and the typical witdh of the
++ // allow setting the minimum length and the typical witdh of the
+ // lines which are to be detected.
+ //
+ //
+--- a/Examples/FeatureExtraction/RatioLineDetectorExample.cxx
++++ b/Examples/FeatureExtraction/RatioLineDetectorExample.cxx
+@@ -184,7 +184,7 @@ int main(int argc, char * argv[])
+ // Software Guide : BeginLatex
+ //
+ // The methods \code{SetLengthLine()} and \code{SetWidthLine()}
+- // allow to set the minimum length and the typical witdh of the
++ // allow setting the minimum length and the typical witdh of the
+ // lines which are to be detected.
+ //
+ // \index{otb::LineRatioDetector!SetWidthLine()}
+--- a/Examples/Segmentation/VectorConfidenceConnected.cxx
++++ b/Examples/Segmentation/VectorConfidenceConnected.cxx
+@@ -294,7 +294,7 @@ int main( int argc, char *argv[] )
+ // The coloration of muscular tissue makes it easy to distinguish them from
+ // the surrounding anatomical structures. The optic vitrea on the other hand
+ // has a coloration that is not very homogeneous inside the eyeball and
+- // does not allow to generate a full segmentation based only on color.
++ // does not allow generating a full segmentation based only on color.
+ //
+ // Software Guide : EndLatex
+
+--- a/Examples/Tutorials/Multispectral.cxx
++++ b/Examples/Tutorials/Multispectral.cxx
+@@ -91,7 +91,7 @@ int main(int argc, char * argv[])
+ // Software Guide : BeginLatex
+ //
+ // We need to pass the parameters to the filter for the extraction. This
+- // filter also allow to extract only a spatial subset of the image. However,
++ // filter also allow extracting only a spatial subset of the image. However,
+ // we will extract the whole channel in this case.
+ //
+ // To do that, we need to pass the desired region using the
+--- a/Modules/Adapters/OSSIMAdapters/src/otbDEMHandler.cxx
++++ b/Modules/Adapters/OSSIMAdapters/src/otbDEMHandler.cxx
+@@ -156,7 +156,7 @@ DEMHandler
+ ossimRefPtr<ossimGeoid> geoidPtr = new ossimGeoidEgm96(geoid);
+ if (geoidPtr->getErrorStatus() == ossimErrorCodes::OSSIM_OK)
+ {
+- // Ossim does not allow to retrieve the geoid file path
++ // Ossim does not allow retrieving the geoid file path
+ // We therefore must keep it on our side
+ m_GeoidFile = geoidFile;
+ otbMsgDevMacro(<< "Geoid successfully opened");
+@@ -244,7 +244,7 @@ void
+ DEMHandler
+ ::SetDefaultHeightAboveEllipsoid(double h)
+ {
+- // Ossim does not allow to retrieve the default height above
++ // Ossim does not allow retrieving the default height above
+ // ellipsoid We therefore must keep it on our side
+ m_DefaultHeightAboveEllipsoid = h;
+
+@@ -257,7 +257,7 @@ double
+ DEMHandler
+ ::GetDefaultHeightAboveEllipsoid() const
+ {
+- // Ossim does not allow to retrieve the default height above
++ // Ossim does not allow retrieving the default height above
+ // ellipsoid We therefore must keep it on our side
+ return m_DefaultHeightAboveEllipsoid;
+ }
+@@ -286,7 +286,7 @@ std::string DEMHandler::GetDEMDirectory(
+
+ std::string DEMHandler::GetGeoidFile() const
+ {
+- // Ossim does not allow to retrieve the geoid file path
++ // Ossim does not allow retrieving the geoid file path
+ // We therefore must keep it on our side
+ return m_GeoidFile;
+ }
+--- a/Modules/Applications/AppClassification/app/otbDSFuzzyModelEstimation.cxx
++++ b/Modules/Applications/AppClassification/app/otbDSFuzzyModelEstimation.cxx
+@@ -406,7 +406,7 @@ private:
+ {
+ // An error has occurred in the optimization.
+ // Update the parameters
+- otbAppLogFATAL("ERROR: Exception Catched!" << std::endl);
++ otbAppLogFATAL("ERROR: Exception Caught!" << std::endl);
+ otbAppLogFATAL(<< err.GetDescription() << std::endl);
+ const unsigned int numberOfIterations = m_Optimizer->GetOptimizer()->get_num_evaluations();
+ otbAppLogFATAL("numberOfIterations : " << numberOfIterations << std::endl);
+--- a/Modules/Applications/AppClassification/include/otbTrainBoost.txx
++++ b/Modules/Applications/AppClassification/include/otbTrainBoost.txx
+@@ -29,7 +29,7 @@ namespace Wrapper
+ ::InitBoostParams()
+ {
+ AddChoice("classifier.boost", "Boost classifier");
+- SetParameterDescription("classifier.boost", "This group of parameters allows to set Boost classifier parameters. "
++ SetParameterDescription("classifier.boost", "This group of parameters allows setting Boost classifier parameters. "
+ "See complete documentation here \\url{http://docs.opencv.org/modules/ml/doc/boosting.html}.");
+ //BoostType
+ AddParameter(ParameterType_Choice, "classifier.boost.t", "Boost Type");
+--- a/Modules/Applications/AppClassification/include/otbTrainDecisionTree.txx
++++ b/Modules/Applications/AppClassification/include/otbTrainDecisionTree.txx
+@@ -30,7 +30,7 @@ LearningApplicationBase<TInputValue,TOut
+ {
+ AddChoice("classifier.dt", "Decision Tree classifier");
+ SetParameterDescription("classifier.dt",
+- "This group of parameters allows to set Decision Tree classifier parameters. "
++ "This group of parameters allows setting Decision Tree classifier parameters. "
+ "See complete documentation here \\url{http://docs.opencv.org/modules/ml/doc/decision_trees.html}.");
+ //MaxDepth
+ AddParameter(ParameterType_Int, "classifier.dt.max", "Maximum depth of the tree");
+@@ -55,7 +55,7 @@ LearningApplicationBase<TInputValue,TOut
+
+ //UseSurrogates : don't need to be exposed !
+ //AddParameter(ParameterType_Empty, "classifier.dt.sur", "Surrogate splits will be built");
+- //SetParameterDescription("classifier.dt.sur","These splits allow to work with missing data and compute variable importance correctly.");
++ //SetParameterDescription("classifier.dt.sur","These splits allow working with missing data and compute variable importance correctly.");
+
+ //MaxCategories
+ AddParameter(ParameterType_Int, "classifier.dt.cat",
+--- a/Modules/Applications/AppClassification/include/otbTrainGradientBoostedTree.txx
++++ b/Modules/Applications/AppClassification/include/otbTrainGradientBoostedTree.txx
+@@ -31,7 +31,7 @@ LearningApplicationBase<TInputValue,TOut
+ AddChoice("classifier.gbt", "Gradient Boosted Tree classifier");
+ SetParameterDescription(
+ "classifier.gbt",
+- "This group of parameters allows to set Gradient Boosted Tree classifier parameters. "
++ "This group of parameters allows setting Gradient Boosted Tree classifier parameters. "
+ "See complete documentation here \\url{http://docs.opencv.org/modules/ml/doc/gradient_boosted_trees.html}.");
+
+ if (m_RegressionFlag)
+@@ -74,7 +74,7 @@ LearningApplicationBase<TInputValue,TOut
+
+ //UseSurrogates : don't need to be exposed !
+ //AddParameter(ParameterType_Empty, "classifier.gbt.sur", "Surrogate splits will be built");
+- //SetParameterDescription("classifier.gbt.sur","These splits allow to work with missing data and compute variable importance correctly.");
++ //SetParameterDescription("classifier.gbt.sur","These splits allow working with missing data and compute variable importance correctly.");
+
+ }
+
+--- a/Modules/Applications/AppClassification/include/otbTrainKNN.txx
++++ b/Modules/Applications/AppClassification/include/otbTrainKNN.txx
+@@ -29,7 +29,7 @@ namespace Wrapper
+ ::InitKNNParams()
+ {
+ AddChoice("classifier.knn", "KNN classifier");
+- SetParameterDescription("classifier.knn", "This group of parameters allows to set KNN classifier parameters. "
++ SetParameterDescription("classifier.knn", "This group of parameters allows setting KNN classifier parameters. "
+ "See complete documentation here \\url{http://docs.opencv.org/modules/ml/doc/k_nearest_neighbors.html}.");
+
+ //K parameter
+--- a/Modules/Applications/AppClassification/include/otbTrainLibSVM.txx
++++ b/Modules/Applications/AppClassification/include/otbTrainLibSVM.txx
+@@ -29,7 +29,7 @@ namespace Wrapper
+ ::InitLibSVMParams()
+ {
+ AddChoice("classifier.libsvm", "LibSVM classifier");
+- SetParameterDescription("classifier.libsvm", "This group of parameters allows to set SVM classifier parameters.");
++ SetParameterDescription("classifier.libsvm", "This group of parameters allows setting SVM classifier parameters.");
+ AddParameter(ParameterType_Choice, "classifier.libsvm.k", "SVM Kernel Type");
+ AddChoice("classifier.libsvm.k.linear", "Linear");
+ AddChoice("classifier.libsvm.k.rbf", "Gaussian radial basis function");
+--- a/Modules/Applications/AppClassification/include/otbTrainNeuralNetwork.txx
++++ b/Modules/Applications/AppClassification/include/otbTrainNeuralNetwork.txx
+@@ -31,7 +31,7 @@ LearningApplicationBase<TInputValue,TOut
+ {
+ AddChoice("classifier.ann", "Artificial Neural Network classifier");
+ SetParameterDescription("classifier.ann",
+- "This group of parameters allows to set Artificial Neural Network classifier parameters. "
++ "This group of parameters allows setting Artificial Neural Network classifier parameters. "
+ "See complete documentation here \\url{http://docs.opencv.org/modules/ml/doc/neural_networks.html}.");
+
+ //TrainMethod
+--- a/Modules/Applications/AppClassification/include/otbTrainRandomForests.txx
++++ b/Modules/Applications/AppClassification/include/otbTrainRandomForests.txx
+@@ -30,7 +30,7 @@ LearningApplicationBase<TInputValue,TOut
+ {
+ AddChoice("classifier.rf", "Random forests classifier");
+ SetParameterDescription("classifier.rf",
+- "This group of parameters allows to set Random Forests classifier parameters. "
++ "This group of parameters allows setting Random Forests classifier parameters. "
+ "See complete documentation here \\url{http://docs.opencv.org/modules/ml/doc/random_trees.html}.");
+ //MaxDepth
+ AddParameter(ParameterType_Int, "classifier.rf.max", "Maximum depth of the tree");
+@@ -56,7 +56,7 @@ LearningApplicationBase<TInputValue,TOut
+
+ //UseSurrogates : don't need to be exposed !
+ //AddParameter(ParameterType_Empty, "classifier.rf.sur", "Surrogate splits will be built");
+- //SetParameterDescription("classifier.rf.sur","These splits allow to work with missing data and compute variable importance correctly.");
++ //SetParameterDescription("classifier.rf.sur","These splits allow working with missing data and compute variable importance correctly.");
+
+ //MaxNumberOfCategories
+ AddParameter(ParameterType_Int, "classifier.rf.cat",
+--- a/Modules/Applications/AppClassification/include/otbTrainSVM.txx
++++ b/Modules/Applications/AppClassification/include/otbTrainSVM.txx
+@@ -29,7 +29,7 @@ namespace Wrapper
+ ::InitSVMParams()
+ {
+ AddChoice("classifier.svm", "SVM classifier (OpenCV)");
+- SetParameterDescription("classifier.svm", "This group of parameters allows to set SVM classifier parameters. "
++ SetParameterDescription("classifier.svm", "This group of parameters allows setting SVM classifier parameters. "
+ "See complete documentation here \\url{http://docs.opencv.org/modules/ml/doc/support_vector_machines.html}.");
+ AddParameter(ParameterType_Choice, "classifier.svm.m", "SVM Model Type");
+ SetParameterDescription("classifier.svm.m", "Type of SVM formulation.");
+--- a/Modules/Applications/AppProjection/app/otbSuperimpose.cxx
++++ b/Modules/Applications/AppProjection/app/otbSuperimpose.cxx
+@@ -121,13 +121,13 @@ private:
+
+ // Interpolators
+ AddParameter(ParameterType_Choice, "interpolator", "Interpolation");
+- SetParameterDescription("interpolator","This group of parameters allows to define how the input image will be interpolated during resampling.");
++ SetParameterDescription("interpolator","This group of parameters allows defining how the input image will be interpolated during resampling.");
+
+ AddChoice("interpolator.bco", "Bicubic interpolation");
+ SetParameterDescription("interpolator.bco", "Bicubic interpolation leads to very good image quality but is slow.");
+
+ AddParameter(ParameterType_Radius, "interpolator.bco.radius", "Radius for bicubic interpolation");
+- SetParameterDescription("interpolator.bco.radius","This parameter allows 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.");
++ SetParameterDescription("interpolator.bco.radius","This parameter allows controling 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);
+
+ AddChoice("interpolator.nn", "Nearest Neighbor interpolation");
+--- a/Modules/Core/ImageBase/include/otbImage.h
++++ b/Modules/Core/ImageBase/include/otbImage.h
+@@ -67,7 +67,7 @@ public:
+ typedef typename Superclass::ValueType ValueType;
+
+ /** Internal Pixel representation. Used to maintain a uniform API
+- * with Image Adaptors and allow to keep a particular internal
++ * with Image Adaptors and allow keeping a particular internal
+ * representation of data while showing a different external
+ * representation. */
+ typedef typename Superclass::InternalPixelType InternalPixelType;
+--- a/Modules/Core/ImageBase/include/otbRemoteSensingRegion.h
++++ b/Modules/Core/ImageBase/include/otbRemoteSensingRegion.h
+@@ -116,7 +116,7 @@ public:
+ }
+
+ /** This method provides explicit conversion to itk::ImageRegion<2>,
+- * so as to allow to use RemoteSensingRegion to specify requested
++ * so as to allow using RemoteSensingRegion to specify requested
+ * region for images or images iterators.
+ */
+ const ImageRegionType GetImageRegion()
+--- a/Modules/Core/ImageBase/include/otbVectorImage.h
++++ b/Modules/Core/ImageBase/include/otbVectorImage.h
+@@ -66,7 +66,7 @@ public:
+ typedef typename Superclass::ValueType ValueType;
+
+ /** Internal Pixel representation. Used to maintain a uniform API
+- * with Image Adaptors and allow to keep a particular internal
++ * with Image Adaptors and allow keeping a particular internal
+ * representation of data while showing a different external
+ * representation. */
+ typedef typename Superclass::InternalPixelType InternalPixelType;
+--- a/Modules/Core/Metadata/src/otbPleiadesImageMetadataInterface.cxx
++++ b/Modules/Core/Metadata/src/otbPleiadesImageMetadataInterface.cxx
+@@ -730,7 +730,7 @@ PleiadesImageMetadataInterface::GetSatAz
+ }
+ else
+ {
+- //Got orientation and incidences angle which allow to compute satellite
++ //Got orientation and incidences angle which allow computing satellite
+ // azimuthal angle
+
+ // MSD: for the moment take only topCenter value
+--- a/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h
++++ b/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h
+@@ -32,7 +32,7 @@ namespace otb {
+ * when projecting an image in a target SRS. The user can set the
+ * target projectionRef via SetOutputProjectionRef(std::string).
+ *
+- * This class allow to force using a desired spacing. For
++ * This class allows forcing use of a desired spacing. For
+ * instance, if one need to compute the output Size of an
+ * image in the UTM srs with a spacing of 5 m, it can be set via the
+ * method ForceSpacingTo(spacing).
+--- a/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.h
++++ b/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.h
+@@ -28,8 +28,8 @@ namespace otb
+ * \class ChangeInformationImageFilter
+ * \brief Filter to modify image metadata
+ *
+- * The base class is itk::ChangeInformationImageFilter that allows to
+- * modifiy origin, spacing, direction and buffered region. This deriving
++ * The base class is itk::ChangeInformationImageFilter that allows
++ * modifying origin, spacing, direction and buffered region. This deriving
+ * filter adds the support of MetaDataDictionary.
+ *
+ * \ingroup OTBImageManipulation
+--- a/Modules/Filtering/ImageManipulation/include/otbChangeNoDataValueFilter.h
++++ b/Modules/Filtering/ImageManipulation/include/otbChangeNoDataValueFilter.h
+@@ -64,7 +64,7 @@ public:
+ * This filter reads the no-data flags (a boolean vector indicating
+ * for each band if a no-data value exists) and values (the actual
+ * value to be used as no-data for each band) from
+- * MetaDataDictionary, and allows to change this value.
++ * MetaDataDictionary, and allows changing this value.
+ *
+ * The algorithm is the following: for each pixel, for each channel
+ * in the pixel, if there is a no-data value for this channel
+--- a/Modules/IO/ImageIO/include/otbImageFileReader.h
++++ b/Modules/IO/ImageIO/include/otbImageFileReader.h
+@@ -73,7 +73,7 @@ public:
+ * It interfaces with an ImageIO class to read in the data and
+ * supports streaming (partial reading) if the source dataset does so.
+ *
+- * ImageFileReader supports extended filenames, which allow to control
++ * ImageFileReader supports extended filenames, which allow controling
+ * how the source dataset is read. See
+ * http://wiki.orfeo-toolbox.org/index.php/ExtendedFileName for more
+ * information.
+--- a/Modules/IO/ImageIO/include/otbImageFileWriter.h
++++ b/Modules/IO/ImageIO/include/otbImageFileWriter.h
+@@ -43,7 +43,7 @@ namespace otb
+ * ImageFileWriter will write directly the streaming buffer in the image file, so
+ * that the output image never needs to be completely allocated
+ *
+- * ImageFileWriter supports extended filenames, which allow to control
++ * ImageFileWriter supports extended filenames, which allow controling
+ * some properties of the output file. See
+ * http://wiki.orfeo-toolbox.org/index.php/ExtendedFileName for more
+ * information.
+--- a/Modules/Learning/SOM/include/otbPeriodicSOM.txx
++++ b/Modules/Learning/SOM/include/otbPeriodicSOM.txx
+@@ -58,7 +58,7 @@ PeriodicSOM<TListSample, TMap, TSOMLearn
+ NeighborhoodIteratorType it(radius, map, mapRegion);
+
+ // Here, the periodic update is achieved 'by hand' since
+- // PeriodicBoundaryCondition does not allow to modifiy
++ // PeriodicBoundaryCondition does not allow modifying
+ // VectorImage contents
+ SizeType mapSize = mapRegion.GetSize();
+ IndexType positionToUpdate;
+--- a/Modules/Learning/SOM/include/otbSOMWithMissingValue.txx
++++ b/Modules/Learning/SOM/include/otbSOMWithMissingValue.txx
+@@ -70,7 +70,7 @@ SOMWithMissingValue<TListSample, TMap, T
+ NeighborhoodIteratorType it(radius, map, mapRegion);
+
+ // Here, the periodic update is achieved 'by hand' since
+- // PeriodicBoundaryCondition does not allow to modifiy
++ // PeriodicBoundaryCondition does not allow modifying
+ // VectorImage contents
+ SizeType mapSize = mapRegion.GetSize();
+ IndexType positionToUpdate;
+--- a/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.h
++++ b/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.h
+@@ -81,7 +81,7 @@ public:
+ itkSetMacro(RegressionAccuracy, double);
+
+ /** If true then surrogate splits will be built.
+- * These splits allow to work with missing data and compute variable importance correctly.
++ * These splits allow working with missing data and compute variable importance correctly.
+ * Default is true
+ * \see http://docs.opencv.org/modules/ml/doc/decision_trees.html#CvDTreeParams::CvDTreeParams%28%29
+ */
+--- a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.h
++++ b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.h
+@@ -93,7 +93,7 @@ public:
+ itkSetMacro(MaxDepth, int);
+
+ /** If true then surrogate splits will be built.
+- * These splits allow to work with missing data and compute variable importance correctly.
++ * These splits allow working with missing data and compute variable importance correctly.
+ * Default is false
+ * \see http://docs.opencv.org/modules/ml/doc/gradient_boosted_trees.html#cvgbtreesparams-cvgbtreesparams
+ */
+--- a/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.h
++++ b/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.h
+@@ -74,7 +74,7 @@ public:
+ typedef typename OutputImageType::PixelType DEMPixelType;
+
+ // 3D RS transform
+- // TODO: Allow to tune precision (i.e. double or float)
++ // TODO: Allow tuning precision (i.e. double or float)
+ typedef double PrecisionType;
+ typedef otb::GenericRSTransform<PrecisionType,3,3> RSTransformType;
+
+--- a/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.h
++++ b/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.h
+@@ -88,7 +88,7 @@ public:
+ typedef itk::ImageRegionSplitter<2> SplitterType;
+
+ // 3D RS transform
+- // TODO: Allow to tune precision (i.e. double or float)
++ // TODO: Allow tuning precision (i.e. double or float)
+ typedef otb::GenericRSTransform<double,3,3> RSTransformType;
+ //typedef typename RSTransformType::Pointer RSTransformPointerType;
+
+--- a/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h
++++ b/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h
+@@ -81,7 +81,7 @@ public:
+ typedef typename OutputImageType::PixelType DEMPixelType;
+
+ // 3D RS transform
+- // TODO: Allow to tune precision (i.e. double or float)
++ // TODO: Allow tuning precision (i.e. double or float)
+ typedef double PrecisionType;
+ typedef otb::GenericRSTransform
+ <PrecisionType,3,3> RSTransformType;
+--- a/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h
++++ b/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h
+@@ -111,7 +111,7 @@ public:
+ typedef typename InputMapType::PixelType MapPixelType;
+ typedef typename InputMapType::InternalPixelType InputInternalPixelType;
+ // 3D RS transform
+- // TODO: Allow to tune precision (i.e. double or float)
++ // TODO: Allow tuning precision (i.e. double or float)
+ typedef double PrecisionType;
+ typedef otb::GenericRSTransform
+ <PrecisionType,3,3> RSTransformType;
+--- a/Modules/Remote/otbGRM.remote.cmake
++++ b/Modules/Remote/otbGRM.remote.cmake
+@@ -4,7 +4,7 @@ otb_fetch_module(otbGRM
+ region-merging segmentation on satellite images. Three local homogeneity
+ criteria are available: the Baatz & Schäpe criterion, the Full Lambda Schedule
+ criterion and the simple Euclidean Distance criterion. This application uses
+-the GRM (Generic Region Merging) library which allows to add quickly a new local
++the GRM (Generic Region Merging) library which allows quickly adding a new local
+ homogeneity criterion. Look at the template header file: GRMSegmenterTemplate.h
+ to see which format you must respect to add a new criterion.
+
+--- a/Modules/ThirdParty/GDAL/otb-module-init.cmake
++++ b/Modules/ThirdParty/GDAL/otb-module-init.cmake
+@@ -8,7 +8,7 @@ if(NOT GDAL_FOUND)
+ message(FATAL_ERROR "Cannot find GDAL. Set GDAL_INCLUDE_DIR and GDAL_LIBRARY")
+ endif()
+
+-#Allow to deactivate GDAL checking (done by default)
++#Allow deactivating GDAL checking (done by default)
+ set(GDAL_CONFIG_CHECKING ON CACHE BOOL "Tests to check gdal config." FORCE)
+ mark_as_advanced(GDAL_CONFIG_CHECKING)
+
+--- a/Utilities/Doxygen/OTB/Iterators.dox
++++ b/Utilities/Doxygen/OTB/Iterators.dox
+@@ -106,7 +106,7 @@
+ the image. The user can be sure though, that all the pixels inside the region
+ will be visited.
+
+- The following iterators allow to walk the image in specific directions
++ The following iterators allow walking the image in specific directions
+
+ - itk::ImageLinearIteratorWithIndex Along lines
+ - itk::ImageSliceIteratorWithIndex Along lines, then along planes
+--- a/Utilities/Doxygen/OTB/Modules.dox
++++ b/Utilities/Doxygen/OTB/Modules.dox
+@@ -99,13 +99,13 @@
+ \defgroup Iterators Iterators
+ \ingroup DataAccess
+ Iterators are the mechanism used to walk over the content of a particular data object.
+-They allow to define paths and directions along which the data should be walked through.
++They allow defining paths and directions along which the data should be walked through.
+ */
+
+ /**
+ \defgroup ImageIterators Image Iterators
+ \ingroup Iterators
+-Image Iterators allow to go through the content of an image in a predefined way.
++Image Iterators allow going through the content of an image in a predefined way.
+ For a detailed description of iterators rationale see \ref ImageIteratorsPage
+ */
+
+@@ -412,7 +412,7 @@ For example: you have an image whose pix
+ need to feed this image in a process that expects pixels of type <TT>double</TT>.
+ You have the option of using and ImageFilter that convert the input <TT>unsigned char </TT> image into another of pixel type <TT>double</TT>.
+ However this filter will allocate memory for this second image and will need to be executed.
+-Image Adaptors allow to simulate that you have made the conversion but will avoid the overhead in memory.
++Image Adaptors allow simulating that you have made the conversion but will avoid the overhead in memory.
+ There is however a penalty in performance.
+
+ The mechanism used by image adaptors is to provide a simple function that will be used by ImageIterator (see \ref ImageIteratorsPage) to convert the value of a pixel, in a pixel-by-pixel basis.
--
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