diff --git a/Documentation/Cookbook/rst/Installation.rst b/Documentation/Cookbook/rst/Installation.rst
index e37fd817b6046e39319e6502f05f4825a9e7c4da..6058b155e95676de923b69e2649dbd86d0a0ef90 100644
--- a/Documentation/Cookbook/rst/Installation.rst
+++ b/Documentation/Cookbook/rst/Installation.rst
@@ -28,7 +28,6 @@ Linux x86_64
.. include:: Installation_Linux.txt
-
MacOS X
-------
diff --git a/Documentation/Cookbook/rst/Installation_Linux.txt b/Documentation/Cookbook/rst/Installation_Linux.txt
index 2f3e127104c4eba1aeb41316996177f8d27a94aa..3ca41e0b28b92d2953e5f05fa034bde6a23b0209 100644
--- a/Documentation/Cookbook/rst/Installation_Linux.txt
+++ b/Documentation/Cookbook/rst/Installation_Linux.txt
@@ -33,24 +33,31 @@ archive is extracted, the directory structure consists of:
- ``lib``: A folder containing all shared libraries and OTB
applications.
+- ``include``: A folder containing all the necessary headers to compile OTB
+ based projects.
+
- ``share``: A folder containing common resources and copyright
mentions.
- ``tool``: A folder containing usefull scripts to test the installation or
to uninstall OTB libraries and headers while keeping all the depedencies.
-In order to run the command line launchers, this package doesn’t require
-any special library that is not present in most modern Linux
-distributions. There is a small caveat for "expat" though as these binaries depend
-on "libexpat.so", which can be supplied by most package managers (apt, yum, ...).
-Note that this problem only affects versions 6.0 and older.
-If not already present, it is necessary to install one of the following packages:
+The applications can be launched from the Mapla launcher. If you want to
+use the otbcli and otbgui launchers, you can initialize your environment
+with ``source otbenv.profile``.
-::
+The package can be used to compile other projects using OTB (binaries, libraries
+and headers are included). If you want to build OTB from source using this
+package, you should first uninstall the specific OTB files from the package to
+leave only the dependencies (what we call an XDK). You can do it using the
+supplied script ``tools/uninstall_otb.sh``.
- libexpat-dev libexpat1-dev
+System dependencies
+~~~~~~~~~~~~~~~~~~~
-The graphical executable (otbgui launchers, Monteverdi
+In order to run the command line launchers, this package doesn’t require
+any special library that is not present in most modern Linux
+distributions. The graphical executable (otbgui launchers, Monteverdi
and Mapla) use the X11 libraries, which are widely used in a lot of
distributions:
@@ -58,13 +65,21 @@ distributions:
libx11-6 libxext6 libxau6 libxxf86vm1 libxdmcp6 libdrm2
-Monteverdi also requires the standard graphics libraries libgl1 and
-libglu1. Make sure you have at least one version of them installed
+Monteverdi also requires the standard graphics libraries **libgl1** and
+**libglu1**. Make sure you have at least one version of them installed
in your system.
-The applications can be launched from the Mapla launcher. If you want to
-use the otbcli and otbgui launchers, you can initialize your environment
-with ``source otbenv.profile``.
+Caveat on OTB 6.0
+~~~~~~~~~~~~~~~~~
+
+In OTB 6.0 binaries, there is a small caveat for "expat" as the supplied binaries
+depend on "libexpat.so", which is not contained in the package. It can be
+supplied by most package managers (apt, yum, ...). If not already present, it is
+necessary to install one of the following packages:
+
+::
+
+ libexpat-dev libexpat1-dev
Python bindings
~~~~~~~~~~~~~~~
@@ -112,7 +127,7 @@ A: This is due to a conflict with system Qt4 (usually seen on KDE) and Qt4 + gtk
Q: Monteverdi and Mapla applications look different from my other applications.
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-A: In versions 6.0 and older, Monteverdi, Mapla and otbapplication (otbgui\_\*)
+A: In versions 6.0, Monteverdi, Mapla and otbapplication (otbgui\_\*)
use the system gtk theme. If you can't install GTK on your system you can use the
one distributed with the OTB package. Note that using system GTK is the preferred
way with the OTB standalone package as the distributed version of GTK do not
@@ -124,8 +139,8 @@ To use the distributed GTK libraries you need to set the OTB_USE_LOCAL_GTK:
export OTB_USE_LOCAL_GTK=1
-And now start ``monteverdi.sh`` or ``mapla.sh`` from OTB-|release|-Linux64
+And now start ``monteverdi.sh`` or ``mapla.sh`` from OTB-6.0.0-Linux64
To get back default behaviour, unset OTB_USE_LOCAL_GTK=1 or set OTB_USE_LOCAL_GTK=0
-In version 6.2, the Linux binaries are built without GTK support to cut some
+In version 6.2 and older, the Linux binaries are built without GTK support to cut some
dependencies.
diff --git a/Documentation/Cookbook/rst/Installation_Macx.txt b/Documentation/Cookbook/rst/Installation_Macx.txt
index 7389c07754cdfabbbda4154feb49ee32db0cb0f8..a3ad2d568f6e1fd84e001fb10860e0d04011bc78 100644
--- a/Documentation/Cookbook/rst/Installation_Macx.txt
+++ b/Documentation/Cookbook/rst/Installation_Macx.txt
@@ -22,12 +22,25 @@ Contents of OTB-|release|-Darwin64 is briefly listed below:
- ``lib``: A folder containing all shared libraries and OTB
applications.
+- ``include``: A folder containing all the necessary headers to compile OTB
+ based projects.
+
- ``share``: A folder containing common resources and copyright
mentions.
- ``tool``: A folder containing usefull scripts to test the installation or
to uninstall OTB libraries and headers while keeping all the depedencies.
+The applications can be launched from the Mapla launcher. If you want to
+use the otbcli and otbgui launchers, you can initialize your environment
+with ``source otbenv.profile``.
+
+The package can be used to compile other projects using OTB (binaries, libraries
+and headers are included). If you want to build OTB from source using this
+package, you should first uninstall the specific OTB files from the package to
+leave only the dependencies (what we call an XDK). You can do it using the
+supplied script ``tools/uninstall_otb.sh``.
+
Python bindings
~~~~~~~~~~~~~~~
diff --git a/Documentation/Cookbook/rst/Installation_Windows.txt b/Documentation/Cookbook/rst/Installation_Windows.txt
index 8f4741c77d19e0b127ea75b1de5464ad41c07f95..004238b4e46b6a511b6b61a8d71133afeeedfd23 100644
--- a/Documentation/Cookbook/rst/Installation_Windows.txt
+++ b/Documentation/Cookbook/rst/Installation_Windows.txt
@@ -18,6 +18,9 @@ and their launchers (both command line and graphical launchers are provided):
- ``lib``: A folder containing application DLLs.
+- ``include``: A folder containing all the necessary headers to compile OTB
+ based projects.
+
- ``tool``: A folder containing usefull scripts to test the installation or
to uninstall OTB libraries and headers while keeping all the depedencies.
@@ -25,6 +28,18 @@ The applications can be launched from the Mapla launcher. If you want to
use the otbcli and otbgui launchers, you can initialize a command prompt
with ``otbenv.bat``.
+The package can be used to compile other projects using OTB (binaries, libraries
+and headers are included). If you want to build OTB from source using this
+package, you should first uninstall the specific OTB files from the package to
+leave only the dependencies (what we call an XDK). You can do it using the
+supplied script ``tools/uninstall_otb.bat``.
+
+In the package you also have a template project for Visual 2015
+``OTB Project.zip``. This template can be placed in your user Visual 2015 template
+directory : ``%USERPROFILE%\Documents\Visual Studio 2015\Templates\ProjectTemplates``.
+The script ``start_devenv.bat`` allows to copy the template in that folder and
+start Visual Studio.
+
Python bindings
~~~~~~~~~~~~~~~
diff --git a/Documentation/Latex/style_for_html.cfg b/Documentation/Latex/style_for_html.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..549bc81508e35e4eb035a8f59ca9034ee612b513
--- /dev/null
+++ b/Documentation/Latex/style_for_html.cfg
@@ -0,0 +1,4 @@
+\Preamble{html}
+\Css{body{margin: 0 auto; max-width: 900px;}}
+\begin{document}
+\EndPreamble
diff --git a/Documentation/SoftwareGuide/Art/Cube_HPX.eps b/Documentation/SoftwareGuide/Art/Cube_HPX.eps
index 2a1ef4d844449823325efbc733e223033984c799..e7ec9db08dd3639cd4dd3cc8c8d6bb4bb93497ea 100644
Binary files a/Documentation/SoftwareGuide/Art/Cube_HPX.eps and b/Documentation/SoftwareGuide/Art/Cube_HPX.eps differ
diff --git a/Documentation/SoftwareGuide/Latex/CMakeLists.txt b/Documentation/SoftwareGuide/Latex/CMakeLists.txt
index 5b04644722c4da5fa9b35047d32813fecc19db2d..099e91e0b24d7c7f57b5c4cd5b9c8f26d6b107a7 100644
--- a/Documentation/SoftwareGuide/Latex/CMakeLists.txt
+++ b/Documentation/SoftwareGuide/Latex/CMakeLists.txt
@@ -89,7 +89,7 @@ SET(DVIPS_CONVERTER_OPTIONS -D600)
# Option for html generation
-SET(TEX4HT_OPTIONS "html,2,sections+ \"\" \"\" -shell-escape")
+SET(TEX4HT_OPTIONS "style_for_html,2,sections+ \"\" \"\" -shell-escape")
SET (HTML_OUTPUT "SoftwareGuide-${OTB_VERSION_MAJOR}.${OTB_VERSION_MINOR}")
# Copy RELEASE_NOTES.txt from OTB source tree to Software Guide build directory
diff --git a/Documentation/SoftwareGuide/Latex/Installation.tex b/Documentation/SoftwareGuide/Latex/Installation.tex
index a5521be83db8be2685853792a2dadc55017cd4a9..6c1531dc647cd109b5ebb1a094f7f078d06eb9b7 100644
--- a/Documentation/SoftwareGuide/Latex/Installation.tex
+++ b/Documentation/SoftwareGuide/Latex/Installation.tex
@@ -220,6 +220,14 @@ If you do not know which method to use and just want to compile OTB with all its
\end{tiny}
\end{center}
+If you want to use a standalone binary package, a lot of dependencies are already
+supplied in it. In this case, it is advised to use all of the dependencies from
+that package. Mixing system libraries with libraries from OTB package may not
+be safe. When you call the \textit{otbenv} script in the package, it will add
+an environment variable \texttt{CMAKE\_PREFIX\_PATH}, pointing to the root of the
+OTB package. This variable is used by CMake as a hint to detect the dependencies
+location.
+
\subsection{SuperBuild: Build OTB and all dependencies}
\label{sec:installation-linux-superbuild}
diff --git a/Modules/Applications/AppImageUtils/app/otbConvert.cxx b/Modules/Applications/AppImageUtils/app/otbConvert.cxx
index 362cee272e0e41f3b0852b1281057e044b9b025e..9dc6b4d17559d141591f7c04707c846575743877 100644
--- a/Modules/Applications/AppImageUtils/app/otbConvert.cxx
+++ b/Modules/Applications/AppImageUtils/app/otbConvert.cxx
@@ -105,8 +105,8 @@ private:
SetDocAuthors("OTB-Team");
SetDocSeeAlso("Rescale");
- AddDocTag(Tags::Manip);
AddDocTag(Tags::Deprecated);
+ AddDocTag(Tags::Manip);
AddDocTag("Conversion");
AddDocTag("Image Dynamic");
diff --git a/Modules/Applications/AppImageUtils/app/otbDynamicConvert.cxx b/Modules/Applications/AppImageUtils/app/otbDynamicConvert.cxx
index a714194faf7c185f000bf0efa3390d1b5daec33e..08696439549ca1c0b15e66baffd3352ccee7d29b 100644
--- a/Modules/Applications/AppImageUtils/app/otbDynamicConvert.cxx
+++ b/Modules/Applications/AppImageUtils/app/otbDynamicConvert.cxx
@@ -70,36 +70,39 @@ public:
typedef itk::Statistics::ListSample<FloatVectorImageType::PixelType> ListSampleType;
typedef itk::Statistics::DenseFrequencyContainer2 DFContainerType;
typedef ListSampleToHistogramListGenerator<ListSampleType,
- FloatVectorImageType::InternalPixelType,
- DFContainerType> HistogramsGeneratorType;
+ FloatVectorImageType::InternalPixelType,
+ DFContainerType> HistogramsGeneratorType;
+
typedef StreamingShrinkImageFilter<FloatVectorImageType,
- FloatVectorImageType> ShrinkFilterType;
+ FloatVectorImageType> ShrinkFilterType;
+
typedef Functor::LogFunctor<FloatVectorImageType::InternalPixelType> TransferLogFunctor;
typedef UnaryImageFunctorWithVectorImageFilter<FloatVectorImageType,
- FloatVectorImageType,
- TransferLogFunctor> TransferLogType;
+ FloatVectorImageType,
+ TransferLogFunctor> TransferLogType;
private:
void DoInit() ITK_OVERRIDE
{
SetName("DynamicConvert");
- SetDescription("Convert an image to a different format and rescaling the dynamic ...");
+ SetDescription("Change the pixel type and rescale the image's dynamic");
// Documentation
SetDocName("Dynamic Conversion");
// TODO
- SetDocLongDescription("This application performs an image pixel type conversion "
- "(short, ushort, uchar, int, uint, float and double types are handled). "
- "The output image is written in the specified format (ie. that corresponds "
- "to the given extension).\n The conversion can include a rescale of the data range, "
- "by default it's set from 2% to 98% of the data values. The rescale can be linear or log2. \n "
- "The choice of the output channels can be done with the extended filename, "
- "but less easy to handle. To do this, a 'channels' parameter allows you to select "
- "the desired bands at the output. There are 3 modes, the available choices are: \n"
- " * grayscale : to display mono image as standard color image \n"
- " * rgb : select 3 bands in the input image (multi-bands) \n"
- " * all : keep all bands.");
+ SetDocLongDescription("This application performs an image pixel type "
+ "conversion (short, ushort, uchar, int, uint, float and double types are "
+ "handled). The output image is written in the specified format (ie. "
+ "that corresponds to the given extension).\n The conversion can include "
+ "a rescale of the data range, by default it's set between the 2nd to "
+ "the 98th percentile. The rescale can be linear or log2. \n The choice "
+ "of the output channels can be done with the extended filename, but "
+ "less easy to handle. To do this, a 'channels' parameter allows you to "
+ "select the desired bands at the output. There are 3 modes, the "
+ "available choices are: \n * grayscale : to display mono image as "
+ "standard color image \n * rgb : select 3 bands in the input image "
+ "(multi-bands) \n * all : keep all bands.");
SetDocLimitations("None");
SetDocAuthors("OTB-Team");
SetDocSeeAlso("Convert, Rescale");
@@ -121,29 +124,35 @@ private:
AddChoice("type.log2", "Log2");
SetParameterString("type", "linear", false);
- AddParameter(ParameterType_Float,"type.linear.gamma","Gamma correction factor");
- SetParameterDescription("type.linear.gamma","Gamma correction factor");
+ AddParameter(ParameterType_Float,"type.linear.gamma",
+ "Gamma correction factor");
+ SetParameterDescription("type.linear.gamma",
+ "Gamma correction factor");
SetDefaultParameterFloat("type.linear.gamma",1.0);
MandatoryOff("type.linear.gamma");
AddParameter(ParameterType_InputImage, "mask", "Input mask");
- SetParameterDescription("mask", "The masked pixels won't be used to adapt the dynamic "
+ SetParameterDescription("mask",
+ "The masked pixels won't be used to adapt the dynamic "
"(the mask must have the same dimensions as the input image)");
MandatoryOff("mask");
DisableParameter("mask");
AddParameter(ParameterType_Group,"quantile","Histogram quantile cutting");
- SetParameterDescription("quantile","Cut the histogram edges before rescaling");
+ SetParameterDescription("quantile",
+ "Cut the histogram edges before rescaling");
AddParameter(ParameterType_Float, "quantile.high", "High cut quantile");
- SetParameterDescription("quantile.high", "Quantiles to cut from histogram high values "
+ SetParameterDescription("quantile.high",
+ "Quantiles to cut from histogram high values "
"before computing min/max rescaling (in percent, 2 by default)");
MandatoryOff("quantile.high");
SetDefaultParameterFloat("quantile.high", 2.0);
DisableParameter("quantile.high");
AddParameter(ParameterType_Float, "quantile.low", "Low cut quantile");
- SetParameterDescription("quantile.low", "Quantiles to cut from histogram low values "
+ SetParameterDescription("quantile.low",
+ "Quantiles to cut from histogram low values "
"before computing min/max rescaling (in percent, 2 by default)");
MandatoryOff("quantile.low");
SetDefaultParameterFloat("quantile.low", 2.0);
@@ -154,11 +163,14 @@ private:
"of the output image. There are 3 modes, the available choices are:");
AddChoice("channels.all", "Default mode");
- SetParameterDescription("channels.all", "Select all bands in the input image, (1,...,n).");
+ SetParameterDescription("channels.all",
+ "Select all bands in the input image, (1,...,n).");
AddChoice("channels.grayscale", "Grayscale mode");
- SetParameterDescription("channels.grayscale", "Display single channel as standard color image.");
- AddParameter(ParameterType_Int, "channels.grayscale.channel", "Grayscale channel");
+ SetParameterDescription("channels.grayscale",
+ "Display single channel as standard color image.");
+ AddParameter(ParameterType_Int, "channels.grayscale.channel",
+ "Grayscale channel");
SetDefaultParameterInt("channels.grayscale.channel", 1);
SetMinimumParameterIntValue("channels.grayscale.channel", 1);
@@ -205,7 +217,8 @@ private:
{
typedef otb::ImageMetadataInterfaceBase ImageMetadataInterfaceType;
ImageMetadataInterfaceType::Pointer metadataInterface =
- ImageMetadataInterfaceFactory::CreateIMI(GetParameterImage("in")->GetMetaDataDictionary());
+ ImageMetadataInterfaceFactory::CreateIMI(
+ GetParameterImage("in")->GetMetaDataDictionary());
int nbBand = GetParameterImage("in")->GetNumberOfComponentsPerPixel();
SetMaximumParameterIntValue("channels.grayscale.channel", nbBand);
@@ -243,14 +256,17 @@ private:
// Shrink factor is computed so as to load a quicklook of 1000
// pixels square at most
auto imageSize = tempImage->GetLargestPossibleRegion().GetSize();
- unsigned int shrinkFactor = std::max({int(imageSize[0])/1000, int(imageSize[1])/1000, 1});
+ unsigned int shrinkFactor = std::max({int(imageSize[0])/1000,
+ int(imageSize[1])/1000, 1});
otbAppLogDEBUG( << "Shrink factor used to compute Min/Max: "<<shrinkFactor );
otbAppLogDEBUG( << "Shrink starts..." );
typename ShrinkFilterType::Pointer shrinkFilter = ShrinkFilterType::New();
shrinkFilter->SetShrinkFactor(shrinkFactor);
- shrinkFilter->GetStreamer()->SetAutomaticAdaptativeStreaming(GetParameterInt("ram"));
- AddProcess(shrinkFilter->GetStreamer(), "Computing shrink Image for min/max estimation...");
+ shrinkFilter->GetStreamer()->
+ SetAutomaticAdaptativeStreaming(GetParameterInt("ram"));
+ AddProcess(shrinkFilter->GetStreamer(),
+ "Computing shrink Image for min/max estimation...");
if ( rescaleType == "log2")
{
@@ -272,10 +288,12 @@ private:
otbAppLogDEBUG( << "Evaluating input Min/Max..." );
itk::ImageRegionConstIterator<FloatVectorImageType>
- it(shrinkFilter->GetOutput(), shrinkFilter->GetOutput()->GetLargestPossibleRegion());
+ it(shrinkFilter->GetOutput(),
+ shrinkFilter->GetOutput()->GetLargestPossibleRegion());
typename ListSampleType::Pointer listSample = ListSampleType::New();
- listSample->SetMeasurementVectorSize(tempImage->GetNumberOfComponentsPerPixel());
+ listSample->SetMeasurementVectorSize(
+ tempImage->GetNumberOfComponentsPerPixel());
// Now we generate the list of samples
if (IsParameterEnabled("mask"))
@@ -284,10 +302,12 @@ private:
ShrinkFilterType::Pointer maskShrinkFilter = ShrinkFilterType::New();
maskShrinkFilter->SetShrinkFactor(shrinkFactor);
maskShrinkFilter->SetInput(mask);
- maskShrinkFilter->GetStreamer()->SetAutomaticAdaptativeStreaming(GetParameterInt("ram"));
+ maskShrinkFilter->GetStreamer()->
+ SetAutomaticAdaptativeStreaming(GetParameterInt("ram"));
maskShrinkFilter->Update();
- auto itMask = itk::ImageRegionConstIterator<FloatVectorImageType>(maskShrinkFilter->GetOutput(),
+ auto itMask = itk::ImageRegionConstIterator<FloatVectorImageType>(
+ maskShrinkFilter->GetOutput(),
maskShrinkFilter->GetOutput()->GetLargestPossibleRegion());
// Remove masked pixels
@@ -296,7 +316,7 @@ private:
for(; !it.IsAtEnd(); ++it, ++itMask)
{
// float values, so the threshold is set to 0.5
- if (itMask.Get()[0] < 0.5)
+ if (itMask.Get()[0] > 0.5)
{
listSample->PushBack(it.Get());
}
@@ -304,8 +324,8 @@ private:
// if listSample is empty
if (listSample->Size() == 0)
{
- otbAppLogINFO( << "All pixels were masked, the application assume a wrong mask "
- "and include all the image");
+ otbAppLogINFO( << "All pixels were masked, the application assume "
+ "a wrong mask and include all the image");
}
}
@@ -319,7 +339,8 @@ private:
}
// And then the histogram
- typename HistogramsGeneratorType::Pointer histogramsGenerator = HistogramsGeneratorType::New();
+ typename HistogramsGeneratorType::Pointer histogramsGenerator =
+ HistogramsGeneratorType::New();
histogramsGenerator->SetListSample(listSample);
histogramsGenerator->SetNumberOfBins(255);
// Samples with nodata values are ignored
@@ -334,11 +355,15 @@ private:
{
auto && elm = histOutput->GetNthElement(i);
assert(elm);
- inputMin[i] = elm->Quantile(0, 0.01 * GetParameterFloat("quantile.low"));
- inputMax[i] = elm->Quantile(0, 1.0 - 0.01 * GetParameterFloat("quantile.high"));
+ inputMin[i] = elm->Quantile(0,
+ 0.01 * GetParameterFloat("quantile.low"));
+ inputMax[i] = elm->Quantile(0,
+ 1.0 - 0.01 * GetParameterFloat("quantile.high"));
}
- otbAppLogDEBUG( << std::setprecision(5) << "Min/Max computation done : min=" << inputMin
+ otbAppLogDEBUG( << std::setprecision(5)
+ << "Min/Max computation done : min="
+ << inputMin
<< " max=" << inputMax );
rescaler->AutomaticInputMinMaxComputationOff();
@@ -364,6 +389,7 @@ private:
itkExceptionMacro("The outmax value at " << GetParameterFloat("outmax") <<
" is too high, select a value in "<< outmaxvalue <<" max.");
*/
+
maximum.Fill( GetParameterFloat("outmax") );
minimum.Fill( GetParameterFloat("outmin") );
@@ -407,7 +433,8 @@ private:
}
else
{
- itkExceptionMacro(<< "At least one needed channel has an invalid index");
+ itkExceptionMacro(<< "At least one needed channel has an invalid "
+ "index");
}
}
else if (channelMode == "all")
@@ -424,13 +451,14 @@ private:
typename TImageType::Pointer GetSelectedChannels()
{
typedef MultiToMonoChannelExtractROI<FloatVectorImageType::InternalPixelType,
- typename TImageType::InternalPixelType> ExtractROIFilterType;
- typedef otb::ImageList<otb::Image<typename TImageType::InternalPixelType> > ImageListType;
+ typename TImageType::InternalPixelType> ExtractROIFilterType;
+ typedef otb::ImageList<otb::Image<typename TImageType::InternalPixelType> > ImageListType;
typedef ImageListToVectorImageFilter<ImageListType,
- TImageType > ListConcatenerFilterType;
+ TImageType > ListConcatenerFilterType;
- typename ImageListType::Pointer imageList = ImageListType::New();
- typename ListConcatenerFilterType::Pointer concatener = ListConcatenerFilterType::New();
+ typename ImageListType::Pointer imageList = ImageListType::New();
+ typename ListConcatenerFilterType::Pointer concatener =
+ ListConcatenerFilterType::New();
//m_Filters.push_back(imageList.GetPointer());
m_Filters.push_back(concatener.GetPointer());
@@ -442,10 +470,13 @@ private:
for (auto && channel : channels)
{
- typename ExtractROIFilterType::Pointer extractROIFilter = ExtractROIFilterType::New();
+ typename ExtractROIFilterType::Pointer extractROIFilter =
+ ExtractROIFilterType::New();
m_Filters.push_back(extractROIFilter.GetPointer());
extractROIFilter->SetInput(GetParameterImage("in"));
- if (!monoChannel) extractROIFilter->SetChannel(channel);
+ if (!monoChannel)
+ extractROIFilter->SetChannel(channel);
+
extractROIFilter->UpdateOutputInformation();
imageList->PushBack(extractROIFilter->GetOutput());
}
@@ -483,7 +514,8 @@ private:
GenericDoExecute<DoubleVectorImageType>();
break;
default:
- itkExceptionMacro("Unknown pixel type "<<this->GetParameterOutputImagePixelType("out")<<".");
+ itkExceptionMacro("Unknown pixel type "
+ <<this->GetParameterOutputImagePixelType("out")<<".");
break;
}
}
diff --git a/Modules/Applications/AppImageUtils/app/otbRescale.cxx b/Modules/Applications/AppImageUtils/app/otbRescale.cxx
index fa807fbe7af52c68895a2b9259f0fc73235aa946..f5c08c80a24bed127fb76e1fbc93f13d54d40915 100644
--- a/Modules/Applications/AppImageUtils/app/otbRescale.cxx
+++ b/Modules/Applications/AppImageUtils/app/otbRescale.cxx
@@ -62,8 +62,8 @@ private:
SetDocAuthors("OTB-Team");
SetDocSeeAlso(" ");
- AddDocTag(Tags::Manip);
AddDocTag(Tags::Deprecated);
+ AddDocTag(Tags::Manip);
AddParameter(ParameterType_InputImage, "in", "Input Image");
SetParameterDescription( "in", "The image to scale." );
AddParameter(ParameterType_OutputImage, "out", "Output Image");
diff --git a/Modules/Remote/Mosaic.remote.cmake b/Modules/Remote/Mosaic.remote.cmake
index 035a5bc8101097fe9adbd3b7fc852198abba7a92..d26b730b8a570a38b6c611128021e27782f717d9 100644
--- a/Modules/Remote/Mosaic.remote.cmake
+++ b/Modules/Remote/Mosaic.remote.cmake
@@ -5,5 +5,5 @@ A more detailed description can be found on the project website:
https://github.com/remicres/otb-mosaic
"
GIT_REPOSITORY https://github.com/remicres/otb-mosaic.git
- GIT_TAG 56426908db01f33a5b96311e2a7eaac30ecd8e5d
+ GIT_TAG 1d557e3c69cb11428f5dbf7c7039dc966dd8c51e
)