Commit e2067b9a authored by Gaëlle USSEGLIO's avatar Gaëlle USSEGLIO
Browse files

Merge branch 'release-7.4' of...

Merge branch 'release-7.4' of https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb into release-7.4-diapotb-1.0.2
parents 715deb7c 62539c0c
Pipeline #8651 failed with stages
in 71 minutes
......@@ -376,6 +376,8 @@ deploy:
artifacts: true
- job: windows-10-build
artifacts: true
- job: centos-xdk-build
artifacts: true
update-archive:
tags:
......
......@@ -10,7 +10,7 @@ We are ready to release OTB version MAJOR.MINOR.PATCH. The following steps need
* [ ] In this story, make a list of blocking issues for the release (if any)
* [ ] [Update the SuperBuild archive](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#superbuild-archive) (if needed)
* [ ] Update release notes (walk the GitLab MR merged history and log all improvements)
* [ ] Update the date in RELEASE_NOTES.txt
* [ ] [Update the RELEASE_NOTES.txt](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/wikis/Help-for-release-actions#update-the-release_notestxt)
* [ ] Run Debian [spelling](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#spelling-check) checker
* [ ] Run shellcheck script from [OTB-Devutils/Scripts/](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb-devutils/blob/master/Scripts/run_shellcheck.sh)
* [ ] [Update translation](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#translation-for-monteverdi-mapla) for Monteverdi and Mapla
......
......@@ -21,6 +21,7 @@ Christophe Palmann <christophe.palmann@c-s.fr>
Conrad Bielski <conrad.bielski@yahoo.com>
Cyrille Valladeau <cyrille.valladeau@c-s.fr>
Cédric Traizet <cedric.traizet@c-s.fr> Cedric <cedric.traizet@c-s.fr>
Cédric Traizet <cedric.traizet@c-s.fr> Cédric Traizet <cedric.traizet@csgroup.eu>
Cédric Traizet <cedric.traizet@c-s.fr> Cédric Traizet <traizetc@cesbio.cnes.fr>
Cédric Traizet <cedric.traizet@c-s.fr> Traizet Cedric <cedric.traizet@cesbio.cnes.fr>
Cédric Traizet <cedric.traizet@c-s.fr> ctraizet <cedric.traizet@c-s.fr>
......
......@@ -48,7 +48,7 @@ class CDashException(Exception):
pass
"""
Handler class to retrieve build informations
Handler class to retrieve build information
"""
class Handler:
def __init__ (self):
......@@ -112,7 +112,7 @@ class Handler:
def GetBuildId (self, **kwargs):
"""
This function is returning the buildid. Dict can be passed with the
different informations
different information
"""
site = self.site
stamp = self.stamp
......
......@@ -88,7 +88,7 @@ macro(get_xdk)
message( "clone_res = ${clone_res}" )
message( "clone_out = ${clone_out}" )
message( "clone_err = ${clone_err}" )
message( FATAL_ERROR "Problem in retreiving the archive")
message( FATAL_ERROR "Problem in retrieving the archive")
endif()
execute_process(
......
......@@ -191,7 +191,7 @@
#
# The macro ``SOMELIB_EXPORT_TEMPLATE`` should be used when declaring template
# classes or functions. The macro ``SOMELIB_EXPORT_EXPLICIT_TEMPLATE`` should be
# used when compiling explicit instanciations of template classes/functions.
# used when compiling explicit instantiations of template classes/functions.
include(CheckCCompilerFlag)
include(CheckCXXCompilerFlag)
......
......@@ -98,7 +98,7 @@ foreach(otb-module ${OTB_MODULES_ALL})
endforeach()
#----------------------------------------------------------------------
# Construct direct dependees (first-level) of each module
# Construct direct dependencies (first-level) of each module
foreach(otb-module1 ${OTB_MODULES_ALL})
foreach(otb-module2 ${OTB_MODULES_ALL})
list(FIND OTB_MODULE_${otb-module2}_DEPENDS ${otb-module1} _find_output)
......
......@@ -339,7 +339,7 @@ The available syntax for boolean options are:
&multiwrite==<(bool)false>
- To desactivate multi-writing. This option will only be used in application supporting multi-writing (applications with several output images). Instead of computing and writing each image independently, the streamed image blocks are written in a synchronous way for each output. In applications, the default streaming mode is to compute the images strip by strip, with a strip size automatically computed using the available RAM. The streaming mode can be modified using the streaming options (see above), but be aware that the auto and tiled based streaming using RAM might not work properly.
- To deactivate multi-writing. This option will only be used in application supporting multi-writing (applications with several output images). Instead of computing and writing each image independently, the streamed image blocks are written in a synchronous way for each output. In applications, the default streaming mode is to compute the images strip by strip, with a strip size automatically computed using the available RAM. The streaming mode can be modified using the streaming options (see above), but be aware that the auto and tiled based streaming using RAM might not work properly.
- true by default
......
......@@ -78,7 +78,7 @@ int main(int argc, char* argv[])
// of the analysis window. The program will begin by performing change
// detection through the smaller window size and then applying moments update
// by incrementing the radius of the analysis window (i.e. add a ring of
// width 1 pixel around the current neightborhood shape). The process is
// width 1 pixel around the current neighborhood shape). The process is
// applied until the larger window size is reached.
FilterType::Pointer filter = FilterType::New();
filter->SetRadius((winSizeMin - 1) / 2, (winSizeMax - 1) / 2);
......
This example illustrates the class
:doxygen:`MultivariateAlterationDetectorImageFilter`,
which implements the Multivariate Alteration Change Detector
algorithm. This algorihtm allows
algorithm. This algorithm allows
performing change detection from a pair multi-band images, including
images with different number of bands or modalities. Its output is
a multi-band image of change maps, each one being unccorrelated
......
......@@ -24,7 +24,7 @@
*/
// This example illustrates the use of the \doxygen{otb}{AssymmetricFusionOfLineDetectorImageFilter}.
// This example illustrates the use of the \doxygen{otb}{AsymmetricFusionOfLineDetectorImageFilter}.
//
// The first step required to use this filter is to include its header file.
......@@ -110,7 +110,7 @@ int main(int argc, char* argv[])
writer->SetInput(rescaler->GetOutput());
// The methods \code{SetLengthLine()} and \code{SetWidthLine()}
// allow setting the minimum length and the typical witdh of the
// allow setting the minimum length and the typical width of the
// lines which are to be detected.
//
// \index{otb::AsymmetricFusionOfDetector!SetWidthLine()}
......
......@@ -114,7 +114,7 @@ int main(int argc, char* argv[])
writer->SetInput(rescaler->GetOutput());
// The methods \code{SetLengthLine()} and \code{SetWidthLine()}
// allow setting the minimum length and the typical witdh of the
// allow setting the minimum length and the typical width of the
// lines which are to be detected.
//
// \index{otb::LineCorrelationDetector!SetWidthLine()}
......
......@@ -79,7 +79,7 @@ int main(int argc, char* argv[])
reader->SetFileName(infname);
writer->SetFileName(outfname);
// We can now instatiate the filter.
// We can now instantiate the filter.
PanTexTextureFilterType::Pointer textureFilter = PanTexTextureFilterType::New();
......
......@@ -114,7 +114,7 @@ int main(int argc, char* argv[])
writer->SetInput(rescaler->GetOutput());
// The methods \code{SetLengthLine()} and \code{SetWidthLine()}
// allow setting the minimum length and the typical witdh of the
// allow setting the minimum length and the typical width of the
// lines which are to be detected.
//
// \index{otb::LineRatioDetector!SetWidthLine()}
......
......@@ -33,7 +33,7 @@
// the scenes by a family of classes of type
// \doxygen{itk}{ImageIO}. Actually, the OTB image Readers and
// Writers are very similar to those of ITK, but provide new
// functionnalities which are specific to remote sensing images.
// functionalities which are specific to remote sensing images.
//
// The first step for performing reading and writing is to include the
// following headers.
......
......@@ -25,7 +25,7 @@
// This example shows how to read a list of images and concatenate
// them into a vector image. We will write a program which is able to
// perform this operation taking advantage of the streaming
// functionnalities of the processing pipeline. We will assume that
// functionalities of the processing pipeline. We will assume that
// all the input images have the same size and a single band.
//
// The following header files will be needed:
......
......@@ -28,7 +28,7 @@
// image formats which typically support metadata are for example
// CEOS and GeoTiff.
//
// The metadata support is embedded in OTB's IO functionnalities and
// The metadata support is embedded in OTB's IO functionalities and
// is accessible through the \doxygen{otb}{Image} and
// \doxygen{otb}{VectorImage} classes. You should avoid using the
// \doxygen{itk}{Image} class if you want to have metadata support.
......
......@@ -20,7 +20,7 @@
// This example illustrates the use of the \doxygen{otb}{ImageList}
// class. This class provides the functionnalities needed in order to
// class. This class provides the functionalities needed in order to
// integrate image lists as data objects into the OTB
// pipeline. Indeed, if a \code{std::list< ImageType >} was used, the
// update operations on the pipeline might not have the desired
......
......@@ -113,7 +113,7 @@ int main(int argc, char* argv[])
using OptimizerType = otb::MRFOptimizerMetropolis;
// Two energy, deriving from the \doxygen{otb}{MRFEnergy} class need to be instantiated. One energy
// is required for the regularization, taking into account the relashionship between neighborhing pixels
// is required for the regularization, taking into account the relationship between neighboring pixels
// in the classified image. Here it is done with the \doxygen{otb}{MRFEnergyPotts} which implement
// a Potts model.
//
......@@ -188,7 +188,7 @@ int main(int argc, char* argv[])
writer->SetInput(rescaleFilter->GetOutput());
// Finally, the pipeline execution is trigerred.
// Finally, the pipeline execution is triggered.
writer->Update();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment