Commit 86de8dbe authored by Julien Osman's avatar Julien Osman
Browse files

Merge branch '2280-doc-segmentation' into 'develop'

Multiple documentation improvvements

Closes #2280

See merge request !927
parents f61d77ff d6d35f9a
Pipeline #11463 passed with stage
in 20 minutes and 20 seconds
What is new with OTB 8.0
========================
.. note:: To see the complete list of updates, see the `RELEASE NOTES
<https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/blob/develop/RELEASE_NOTES.txt>`_.
OSSIM is used for geometric **sensor modelling** and **metadata
parsing**. It has been a dependency of the OTB since its
beginning. Then adapter classes have been added to hide OSSIM headers
......
......@@ -152,6 +152,7 @@ the applications of your module will be installed in the same folder as OTB appl
mkdir /Path/to/Module/build && cd /Path/to/Module/build
cmake -DOTB_DIR=/PathTo/OTB/install -DOTB_BUILD_MODULE_AS_STANDALONE=ON
-DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0
-DCMAKE_INSTALL_PREFIX=/theModulePath/install -DCMAKE_INSTALL_RPATH=/theModulePath/install/lib
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE ../
make install
......
......@@ -193,8 +193,10 @@ private:
AddParameter(ParameterType_String, "filter.cc.expr", "Condition");
SetParameterDescription("filter.cc.expr",
"User defined connection condition, written as a mathematical expression. Available variables are p(i)b(i), intensity_p(i) and "
"distance (example of expression: distance < 10 )");
"User defined connection condition, written as a mathematical expression. "
"Available variables are 'p(i)b(i)', 'intensity_p(i)' and "
"'distance'. Substitute (i) by the desired value. "
"Example of expression: intensity_p2 > 0.5.");
// Watershed
AddChoice("filter.watershed", "Watershed");
......
......@@ -65,40 +65,6 @@ This software includes code from the GeoTIFF project.
https://trac.osgeo.org/geotiff/browser/trunk/libgeotiff/LICENSE
This software includes code from the OpenThreads library, an OpenSceneGraph
sub-project.
Copyright (c) 2002-2008, The Open Thread Group
http://www.openscenegraph.org/
OpenThreads is released under OpenSceneGraph Public License (OSGPL) 0.0,
i.e. the wxWindows library license:
https://github.com/openscenegraph/OpenSceneGraph/blob/master/LICENSE.txt
This software includes code from the OSSIM project.
Copyright (c) 2015-2016, OSSIM Contributors
http://www.ossim.org/
OSSIM is released under MIT license:
https://github.com/ossimlabs/ossim/blob/dev/LICENSE.txt
This software includes code contributed by the CNES to the "OSSIM Plugins"
project under MIT license. These plugins are derivated from several
third-party works now released under the same MIT license. All the related
copyrights are listed below:
Copyright (C) 2005-2016, Centre National d'Etudes Spatiales (CNES)
Copyright (C) 2008-2010, Centre for Remote Imaging, Sensing and Processing (CRISP)
Copyright (C) 2010-2016, David A. Horner
Copyright (C) 2010-2016, David Burken
Copyright (C) 2010-2016, Frank Warmerdam
Copyright (C) 2010-2016, Garrett Potts
Copyright (C) 2010-2016, John Stastny
https://github.com/ossimlabs/ossim-plugins
These OSSIM plugins source code is embedded in Modules/ThirdParty/OssimPlugins
directory.
These OSSIM plugins are released under MIT license:
https://github.com/ossimlabs/ossim-plugins/blob/dev/LICENSE
This software includes code from the TinyXML project.
Copyright (c) 2001-2010, Lee Thomason
http://www.grinninglizard.com/tinyxml
......@@ -341,12 +307,6 @@ binaries:
https://opensource.org/licenses/BSD-3-Clause
* Modules/Adapters/OSSIMAdapters/test/otbPlatformPositionAdapter.cxx
Copyright 2011 Emmanuel Christophe
Apache Software License (ASL) v2.0
http://www.apache.org/licenses/LICENSE-2.0
* Modules/Wrappers/SWIG/src/numpy.i
Copyright (c) 2005-2015, NumPy Developers
BSD 3-Clause license
......
Supports Markdown
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