Merge branch 'develop' into cmake_upgrade

.gitlab-ci.yml

@@ -62,6 +62,7 @@ stages:
       - build/compile_commands.json
       - build/ctest_report.xml
       - build/cppcheck_report.xml
+      - build/coverage_report.xml
 
 .common-prepare:
   extends: .general
@@ -101,6 +102,7 @@ debian-build:
   image: $BUILD_IMAGE_REGISTRY/otb-debian-native:unstable
   script:
     - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_ci.cmake -DIMAGE_NAME:string=debian-unstable-gcc
+  dependencies: []
 
 ## Ubuntu superbuild
 ubuntu-xdk-prepare:
@@ -218,21 +220,35 @@ windows-8-build:
 #------------------------- QA related jobs -------------------------------------
 ubuntu-xdk-qa-code-coverage:
   extends: .common-build
+  only:
+    refs:
+      - merge_requests
+      - develop
+      - /^release-[0-9]+\.[0-9]+$/
+    variables:
+      - $SONAR_OTB_TOKEN
   image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-superbuild-qa:18.04
   script:
     - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96"
                ctest -V -S CI/main_qa.cmake
-                     -DIMAGE_NAME:string=ubuntu-18.04-llvm-xdk
+                     -DIMAGE_NAME:string=ubuntu-18.04-llvm-qa
                      -DQA:BOOL=ON
+    - ./CI/otb_coverage.sh
     - saxon-xslt -o build/ctest_report.xml
                  build/Testing/`head -n 1 build/Testing/TAG`/Test.xml
                  CI/ctest2junit.xsl
-  after_script: []
   dependencies:
     - ubuntu-xdk-prepare
 
 ubuntu-xdk-qa-static-analysis:
   extends: .common-build
+  only:
+    refs:
+      - merge_requests
+      - develop
+      - /^release-[0-9]+\.[0-9]+$/
+    variables:
+      - $SONAR_OTB_TOKEN
   image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-superbuild-qa:18.04
   script:
     - find Modules -type f -regextype posix-extended -regex '.*\.(h|hxx)$' -exec dirname '{}' \; |
@@ -254,9 +270,12 @@ ubuntu-xdk-report:
   image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-superbuild-qa:18.04
   stage: report
   only:
-    - merge_requests
-    - develop
-    - /^release-[0-9]+\.[0-9]+$/
+    refs:
+      - merge_requests
+      - develop
+      - /^release-[0-9]+\.[0-9]+$/
+    variables:
+      - $SONAR_OTB_TOKEN
   script:
     - sonar-scanner -Dproject.settings=sonar-project.properties
                     -Dsonar.host.url=https://sonar.orfeo-toolbox.org

CI/main_qa.cmake

@@ -18,27 +18,11 @@
 # limitations under the License.
 #
 
-include( "${CMAKE_CURRENT_LIST_DIR}/macros.cmake" )
 
-set( ENV{LANG} "C" ) # Only ascii output
 get_filename_component( OTB_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY )
 
-set( DEBUG "1" )
-set( CMAKE_COMMAND "cmake" )
 set( CMAKE_EXPORT_COMPILE_COMMANDS ON )
+set( ci_build_type "Debug" )
+set( CTEST_TEST_TIMEOUT 1500)
 
-# retrieve XDK
-get_xdk()
-
-set( INSTALL_DIR "${XDK_PATH}" )
-
-# FIX ME this part might platform dependent
-set( GDAL_DATA "${XDK_PATH}/share/gdal" )
-set( GEOTIFF_CSV "${XDK_PATH}/share/epsg_csv" )
-set( PROJ_LIB "${XDK_PATH}/share" )
-set( CTEST_ENVIRONMENT "PATH=${XDK_PATH}/lib:${XDK_PATH}/bin:$ENV{PATH}" )
-
-set( ci_do_cookbook -1 )
-set( ci_do_doxygen -1 )
-
-include( "${CMAKE_CURRENT_LIST_DIR}/main_ci.cmake" )
+include( "${CMAKE_CURRENT_LIST_DIR}/main_superbuild.cmake" )

CI/otb_coverage.sh

+#!/bin/bash
+
+# usage : call CI/otb_coverage.sh from source dir
+OTB_DIR="$(dirname $0)/.."
+OTB_DIR="$(readlink -f $OTB_DIR)"
+
+if [ -z "$BUILD_DIR" ]; then
+BUILD_DIR=${OTB_DIR}/build
+fi
+
+echo Generating gcov reports in $BUILD_DIR ...
+cd $BUILD_DIR
+find $BUILD_DIR -name "*.gcda" -exec llvm-cov gcov -p '{}' > /dev/null \;
+ls *.gcov | grep -E -v '#Modules#[a-zA-Z0-9]+#[a-zA-Z0-9]+#(include|src|app)#' | xargs -L 1 rm
+echo Filtered $(ls $BUILD_DIR/*.gcov | wc -l) gcov reports
+
+gcovr -r $OTB_DIR -x -g --object-directory=$BUILD_DIR > $BUILD_DIR/coverage_report.xml
+echo Generated $BUILD_DIR/coverage_report.xml with $(grep -c '<class ' $BUILD_DIR/coverage_report.xml) classes

CI/ubuntu-18.04-llvm-qa.cmake

+#
+# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+#
+# This file is part of Orfeo Toolbox
+#
+#     https://www.orfeo-toolbox.org/
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Configuration options for ubuntu-18.04-llvm-qa
+
+set(site_option
+"CMAKE_C_COMPILER:STRING=clang
+CMAKE_CXX_COMPILER:STRING=clang++
+CMAKE_C_FLAGS:STRING=--coverage
+CMAKE_CXX_FLAGS:STRING=--coverage
+CMAKE_EXE_LINKER_FLAGS:STRING=-fuse-ld=lld
+CMAKE_MODULE_LINKER_FLAGS:STRING=-fuse-ld=lld
+CMAKE_SHARED_LINKER_FLAGS:STRING=-fuse-ld=lld
+")

Data/Baseline/OTB/Files/dmDisparityMapEstimationOutput1.txt

-Point [25.000000, 28.000000] -> transform parameters: [-1, 1, 2, 0.9999999999999982, 1.999999999999999]
-Point [33.000000, 28.000000] -> transform parameters: [-1, 1, 2, 0.9999999999999982, 1.999999999999999]
 Point [29.000000, 32.000000] -> transform parameters: [-1, 1, 2, 0.9999999999999982, 1.999999999999999]
-Point [195.000000, 34.000000] -> transform parameters: [-1, -2, 1, -1.99999999999999, 0.9999999999999986]
-Point [203.000000, 34.000000] -> transform parameters: [-1, -2, 1, -1.99999999999999, 0.9999999999999986]
-Point [25.000000, 36.000000] -> transform parameters: [-1, 1, 2, 0.9999999999999982, 1.999999999999999]
-Point [33.000000, 36.000000] -> transform parameters: [-1, 1, 2, 0.9999999999999982, 1.999999999999999]
-Point [105.000000, 38.000000] -> transform parameters: [-0.4326462096884831, -0.8237850307980636, -2.1762149692019364, -0.8237850307980573, -2.17621496920194]
-Point [113.000000, 38.000000] -> transform parameters: [-0.4326462096884831, -0.8237850307980636, -2.1762149692019364, -0.8237850307980573, -2.17621496920194]
 Point [199.000000, 38.000000] -> transform parameters: [-1, -2, 1, -1.99999999999999, 0.9999999999999986]
-Point [109.000000, 42.000000] -> transform parameters: [-0.4326462096884831, -0.8237850307980636, -2.1762149692019364, -0.8237850307980573, -2.17621496920194]
-Point [195.000000, 42.000000] -> transform parameters: [-1, -2, 1, -1.99999999999999, 0.9999999999999986]
-Point [203.000000, 42.000000] -> transform parameters: [-1, -2, 1, -1.99999999999999, 0.9999999999999986]
-Point [105.000000, 46.000000] -> transform parameters: [-0.4326462096884831, -0.8237850307980636, -2.1762149692019364, -0.8237850307980573, -2.17621496920194]
-Point [113.000000, 46.000000] -> transform parameters: [-0.4326462096884831, -0.8237850307980636, -2.1762149692019364, -0.8237850307980573, -2.17621496920194]
-Point [182.000000, 82.000000] -> transform parameters: [-0.43264620968848305, 2.1762149692019364, -0.8237850307980636, 2.1762149692019426, -0.8237850307980593]
-Point [190.000000, 82.000000] -> transform parameters: [-0.43264620968848305, 2.1762149692019364, -0.8237850307980636, 2.1762149692019426, -0.8237850307980593]
-Point [186.000000, 86.000000] -> transform parameters: [-0.43264620968848305, 2.1762149692019364, -0.8237850307980636, 2.1762149692019426, -0.8237850307980593]
-Point [182.000000, 90.000000] -> transform parameters: [-0.43264620968848305, 2.1762149692019364, -0.8237850307980636, 2.1762149692019426, -0.8237850307980593]
-Point [190.000000, 90.000000] -> transform parameters: [-0.43264620968848305, 2.1762149692019364, -0.8237850307980636, 2.1762149692019426, -0.8237850307980593]
-Point [118.000000, 94.000000] -> transform parameters: [-0.06895526364944375, 0.0041981524022816075, 0.01659005014019499, 0.004198152402284198, 0.016590050140193883]
-Point [126.000000, 94.000000] -> transform parameters: [-0.06895526364944375, 0.0041981524022816075, 0.01659005014019499, 0.004198152402284198, 0.016590050140193883]
-Point [62.000000, 98.000000] -> transform parameters: [-1, -3, 0, -2.999999999999998, -2.997447705593446e-17]
-Point [70.000000, 98.000000] -> transform parameters: [-1, -3, 0, -2.999999999999998, -2.997447705593446e-17]
-Point [122.000000, 98.000000] -> transform parameters: [-0.06895526364944375, 0.0041981524022816075, 0.01659005014019499, 0.004198152402284198, 0.016590050140193883]
-Point [66.000000, 102.000000] -> transform parameters: [-1, -3, 0, -2.999999999999998, -2.997447705593446e-17]
-Point [118.000000, 102.000000] -> transform parameters: [-0.06895526364944375, 0.0041981524022816075, 0.01659005014019499, 0.004198152402284198, 0.016590050140193883]
-Point [126.000000, 102.000000] -> transform parameters: [-0.06895526364944375, 0.0041981524022816075, 0.01659005014019499, 0.004198152402284198, 0.016590050140193883]
-Point [62.000000, 106.000000] -> transform parameters: [-1, -3, 0, -2.999999999999998, -2.997447705593446e-17]
-Point [70.000000, 106.000000] -> transform parameters: [-1, -3, 0, -2.999999999999998, -2.997447705593446e-17]
-Point [21.000000, 127.000000] -> transform parameters: [-0.4094814161469302, -0.09996668018703403, 0.09996668018702337, -0.09996668018703297, 0.09996668018703014]
-Point [29.000000, 127.000000] -> transform parameters: [-0.4094814161469302, -0.09996668018703403, 0.09996668018702337, -0.09996668018703297, 0.09996668018703014]
-Point [25.000000, 131.000000] -> transform parameters: [-0.4094814161469302, -0.09996668018703403, 0.09996668018703758, -0.09996668018703297, 0.09996668018703014]
-Point [175.000000, 131.000000] -> transform parameters: [-1, 2, 0, 1.9999999999999871, 2.0182200400791482e-17]
-Point [183.000000, 131.000000] -> transform parameters: [-1, 2, 0, 1.9999999999999871, 2.0182200400791482e-17]
-Point [21.000000, 135.000000] -> transform parameters: [-0.4094814161469302, -0.09996668018703403, 0.09996668018703758, -0.09996668018703297, 0.09996668018703014]
-Point [29.000000, 135.000000] -> transform parameters: [-0.4094814161469302, -0.09996668018703403, 0.09996668018703758, -0.09996668018703297, 0.09996668018703014]
+Point [109.000000, 42.000000] -> transform parameters: [-0.452124907113126, -0.8283223404045827, -2.0723224585710938, -0.8283223404045758, -2.072322458571092]
+Point [186.000000, 86.000000] -> transform parameters: [-0.4521249071131251, 2.0723224585710796, -0.8283223404045685, 2.0723224585710915, -0.8283223404045712]
+Point [122.000000, 98.000000] -> transform parameters: [-0.07914484780444003, 0.004023414455602392, 0.1883684912752983, 0.0040234144556013235, 0.18836849127529462]
+Point [66.000000, 102.000000] -> transform parameters: [-1, -3, 0, -2.9999999999999964, 5.3833972119105215e-17]
+Point [25.000000, 131.000000] -> transform parameters: [-0.4126585211258881, 0.05046050479198172, -0.05046050479197106, 0.050460504791982844, -0.050460504791982816]
 Point [179.000000, 135.000000] -> transform parameters: [-1, 2, 0, 1.9999999999999871, 2.0182200400791482e-17]
-Point [175.000000, 139.000000] -> transform parameters: [-1, 2, 0, 1.9999999999999871, 2.0182200400791482e-17]
-Point [183.000000, 139.000000] -> transform parameters: [-1, 2, 0, 1.9999999999999871, 2.0182200400791482e-17]
-Point [110.000000, 154.000000] -> transform parameters: [-1, -2, 1, -1.9999999999999931, 0.9999999999999927]
-Point [118.000000, 154.000000] -> transform parameters: [-1, -2, 1, -1.9999999999999931, 0.9999999999999927]
 Point [114.000000, 158.000000] -> transform parameters: [-1, -2, 1, -1.9999999999999931, 0.9999999999999927]
-Point [110.000000, 162.000000] -> transform parameters: [-1, -2, 1, -1.9999999999999931, 0.9999999999999927]
-Point [118.000000, 162.000000] -> transform parameters: [-1, -2, 1, -1.9999999999999931, 0.9999999999999927]
-Point [39.000000, 171.000000] -> transform parameters: [-0.4326462096884826, 2.1762149692019435, 0.8237850307980636, 2.1762149692019412, 0.8237850307980553]
-Point [45.000000, 171.000000] -> transform parameters: [-0.4326462096884826, 2.1762149692019435, 0.8237850307980636, 2.1762149692019412, 0.8237850307980553]
-Point [42.000000, 174.000000] -> transform parameters: [-0.4326462096884826, 2.1762149692019435, 0.8237850307980636, 2.1762149692019412, 0.8237850307980553]
-Point [38.000000, 178.000000] -> transform parameters: [-0.4326462096884826, 2.1762149692019435, 0.8237850307980636, 2.1762149692019412, 0.8237850307980553]
-Point [46.000000, 178.000000] -> transform parameters: [-0.4326462096884826, 2.1762149692019435, 0.8237850307980636, 2.1762149692019412, 0.8237850307980553]
-Point [191.000000, 193.000000] -> transform parameters: [-0.40948141614693134, -2.099966680187009, -1.9000333198129624, -2.0999666801870225, -1.9000333198129742]
-Point [199.000000, 193.000000] -> transform parameters: [-0.40948141614693134, -2.099966680187009, -1.9000333198129624, -2.0999666801870225, -1.9000333198129742]
-Point [195.000000, 197.000000] -> transform parameters: [-0.40948141614693134, -2.099966680187009, -1.9000333198129624, -2.0999666801870225, -1.9000333198129742]
-Point [191.000000, 201.000000] -> transform parameters: [-0.40948141614693134, -2.099966680187009, -1.9000333198129624, -2.0999666801870225, -1.9000333198129742]
-Point [199.000000, 201.000000] -> transform parameters: [-0.40948141614693134, -2.099966680187009, -1.9000333198129624, -2.0999666801870225, -1.9000333198129742]
-Point [74.000000, 214.000000] -> transform parameters: [-0.3243961363713258, -0.3581175553554914, -0.49646256945948153, -0.358117555355491, -0.4964625694594842]
-Point [82.000000, 214.000000] -> transform parameters: [-0.3243961363713258, -0.3581175553554914, -0.49646256945948153, -0.358117555355491, -0.4964625694594842]
-Point [78.000000, 218.000000] -> transform parameters: [-0.3243961363713258, -0.3581175553554914, -0.49646256945948153, -0.358117555355491, -0.4964625694594842]
-Point [74.000000, 222.000000] -> transform parameters: [-0.3243961363713258, -0.3581175553554914, -0.49646256945948153, -0.358117555355491, -0.4964625694594842]
-Point [82.000000, 222.000000] -> transform parameters: [-0.3243961363713258, -0.3581175553554914, -0.49646256945948153, -0.358117555355491, -0.4964625694594842]
-Point [139.000000, 227.000000] -> transform parameters: [-0.43264620968848305, 2.1762149692019364, -0.8237850307980636, 2.1762149692019417, -0.8237850307980512]
-Point [147.000000, 227.000000] -> transform parameters: [-0.43264620968848305, 2.1762149692019364, -0.8237850307980636, 2.1762149692019417, -0.8237850307980512]
-Point [143.000000, 231.000000] -> transform parameters: [-0.43264620968848305, 2.1762149692019364, -0.8237850307980636, 2.1762149692019417, -0.8237850307980512]
-Point [139.000000, 235.000000] -> transform parameters: [-0.43264620968848305, 2.1762149692019364, -0.8237850307980636, 2.1762149692019417, -0.8237850307980512]
-Point [147.000000, 235.000000] -> transform parameters: [-0.43264620968848305, 2.1762149692019364, -0.8237850307980636, 2.1762149692019417, -0.8237850307980512]
+Point [42.000000, 174.000000] -> transform parameters: [-0.45212490711312603, 2.0723224585710938, 0.8283223404045827, 2.0723224585710924, 0.8283223404045742]
+Point [195.000000, 197.000000] -> transform parameters: [-0.05964744901725145, -0.3946432423196029, -0.455084544098014, -0.39464324231959125, -0.45508454409802646]
+Point [78.000000, 218.000000] -> transform parameters: [-0.30451124953005193, -0.3869494822710493, -0.37966725310383254, -0.3869494822710459, -0.37966725310382177]
+Point [143.000000, 231.000000] -> transform parameters: [-0.45212490711312164, 2.072322458571108, -0.8283223404045543, 2.0723224585710946, -0.8283223404045682]

Documentation/Cookbook/rst/PythonAPI.rst

@@ -218,6 +218,68 @@ implementation does not break it, for instance by using an internal
 writer to write intermediate data. In this case, execution should
 still be correct, but some intermediate data will be read or written.
 
+Mixed in-memory / on-disk connection
+------------------------------------
+
+As an extension to the connection of OTB Applications (described in previous
+section), a mixed mode is also available to easily switch between:
+
+- **in-memory**: if you want to avoid unecessary I/O between applications
+- **on-disk**: if you want intermediate outputs on disk
+
+This mixed mode is based on the ``Application::ConnectImage()`` function. This
+is how you use it:
+
+.. code-block:: python
+
+    # for in-memory mode
+    app1 = otb.Registry.CreateApplication("Smoothing")
+    app2 = otb.Registry.CreateApplication("Smoothing")
+    
+    app1.IN = input_image
+    
+    app2.ConnectImage("in", app1, "out")
+    app2.OUT = output_image
+    app2.ExecuteAndWriteOutput()
+
+Comparing with the standard in-memory connection, you can notice that:
+
+- the syntax to do the connection is simpler
+- you don't need to call ``Execute()`` on upstream applications anymore,
+  this is done recursively by calling ``ExecuteAndWriteOutput()`` on the latest
+  application
+
+The on-disk version of this code is very similar:
+
+.. code-block:: python
+
+    # for on-disk mode
+    app1 = otb.Registry.CreateApplication("Smoothing")
+    app2 = otb.Registry.CreateApplication("Smoothing")
+    
+    app1.IN = input_image
+    app1.OUT = temp_image
+    
+    app2.ConnectImage("in", app1, "out")
+    app2.OUT = output_image
+    app2.PropagateConnectMode(False)
+    app2.ExecuteAndWriteOutput()
+
+The function ``PropagateConnectMode()`` is applied recursively in the upstream
+applications. It allows to change between the 2 modes:
+
+- ``True`` : means in-memory mode (this is the default)
+- ``False`` : means on-disk mode
+
+When you want to use the on-disk mode, you have to specify the path to
+the intermediate image in the **output** image parameter of the upstream
+application (``app1.OUT`` in the previous example). If this path is empty, the
+in-memory mode is used as fallback.
+
+This feature also works for ``InputImageList``. Calling the function
+``ConnectImage("il", app1, "out")``, with ``il`` being an input image list, will
+append a new image to the list, and connect it to output parameter ``out``.
+
 Load and save parameters to XML
 -------------------------------
 

Examples/ChangeDetection/test/CMakeLists.txt

@@ -83,5 +83,5 @@ otb_add_test(NAME cdTeKullbackLeiblerProfileChDetTest COMMAND ${OTB_TEST_DRIVER}
     ${INPUTDATA}/GomaAvant.png
     ${INPUTDATA}/GomaApres.png
     ${TEMP}/KullbackLeiblerProfileChDetTest.png
-    5 51 1 12 24
+    5 30 1 6 12
 )

Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.hxx

@@ -451,7 +451,6 @@ T otb::ogr::Field::GetValue() const
   typedef typename boost::mpl::at<internal::FieldType_Map, T>::type Kind;
   //const int VALUE = Kind::value;
   BOOST_STATIC_ASSERT(!(boost::is_same<Kind, boost::mpl::void_>::value));
-  assert(m_Definition.GetType() == Kind::value && "OGR field type mismatches the type of requested field value");
   typedef typename boost::mpl::at<internal::FieldGetters_Map, Kind>::type GetterType;
   // If you experience a static assertion failure in the line below, it means
   // the field cannot be extracted into the type requested.

Modules/Filtering/ChangeDetection/test/CMakeLists.txt

@@ -119,7 +119,7 @@ otb_add_test(NAME cdTvKullbackLeiblerProfileImageFilter COMMAND otbChangeDetecti
   ${INPUTDATA}/GomaAvant.png
   ${INPUTDATA}/GomaApres.png
   ${TEMP}/cdTVKullbackLeiblerProfileImageFilterOutput.tif
-  5 51)
+  5 31)
 
 otb_add_test(NAME cdTvKullbackLeiblerDistanceImageFilter COMMAND otbChangeDetectionTestDriver
   --compare-image ${EPSILON_10}

Modules/Filtering/Convolution/test/CMakeLists.txt

@@ -63,10 +63,10 @@ otb_add_test(NAME bfTvCompareOverlapSaveAndClassicalConvolutionWithGaborFilter C
   ${TEMP}/bfTvCompareConvolutionOutput.tif
   ${TEMP}/bfTvCompareOSConvolutionoutput.tif
   otbCompareOverlapSaveAndClassicalConvolutionWithGaborFilter
-  ${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub.tif
+  ${INPUTDATA}/QB_PAN_ROI_1000_100.tif
   ${TEMP}/bfTvCompareConvolutionOutput.tif
   ${TEMP}/bfTvCompareOSConvolutionoutput.tif
-  64 64 #Radius
+  32 32 #Radius
   0.02 0.025 # a b
   -45 # theta
   0.0125 0.0125 #u0 v0

Modules/Filtering/Smoothing/test/CMakeLists.txt

@@ -74,13 +74,13 @@ otb_add_test(NAME bfTvMeanShiftSmoothingImageFilterNonOptim COMMAND otbSmoothing
   2 10 0.1 10 0
   )
 
-otb_add_test(NAME bfTuMeanShiftSmoothingImageFilterROIQBMul4 COMMAND otbSmoothingTestDriver
+otb_add_test(NAME bfTuMeanShiftSmoothingImageFilterROIQB COMMAND otbSmoothingTestDriver
   otbMeanShiftSmoothingImageFilter
-  ${INPUTDATA}/ROI_QB_MUL_4.tif
-  ${TEMP}/bfMeanShiftSmoothingImageFilterSpatialOutput_ROIQBMul4.tif
-  ${TEMP}/bfMeanShiftSmoothingImageFilterSpectralOutput_ROIQBMul4.tif
-  ${TEMP}/bfMeanShiftSmoothingImageFilterIterationOutput_ROIQBMul4.tif
-  ${TEMP}/bfMeanShiftSmoothingImageFilterLabelOutput_ROIQBMul4.tif
+  ${INPUTDATA}/QB_MUL_ROI_1000_100.tif
+  ${TEMP}/bfMeanShiftSmoothingImageFilterSpatialOutput_ROIQB.tif
+  ${TEMP}/bfMeanShiftSmoothingImageFilterSpectralOutput_ROIQB.tif
+  ${TEMP}/bfMeanShiftSmoothingImageFilterIterationOutput_ROIQB.tif
+  ${TEMP}/bfMeanShiftSmoothingImageFilterLabelOutput_ROIQB.tif
   4 50 0.1 100
   )
 
@@ -133,19 +133,19 @@ otb_add_test(NAME bfTuMeanShiftSmoothingImageFilterQBRoad COMMAND otbSmoothingTe
 
 otb_add_test(NAME bfTuMeanShiftSmoothingImageFilterSpatialStability COMMAND otbSmoothingTestDriver
   otbMeanShiftSmoothingImageFilterSpatialStability
-  ${INPUTDATA}/ROI_QB_MUL_4.tif
-  4 50 0.1 40
-  100 100 512 512
+  ${INPUTDATA}/QB_MUL_ROI_1000_100.tif
+  2 50 0.1 10
+  10 10 80 80
   )
 
 
 otb_add_test(NAME bfTvMeanShiftSmoothingImageFilterThreadingNonOpt COMMAND otbSmoothingTestDriver
   --compare-image ${EPSILON_7}
-  ${TEMP}/bfMeanShiftSmoothingImageFilter2SingleThreading_SPOT5.tif
-  ${TEMP}/bfMeanShiftSmoothingImageFilter2MultiThreading_SPOT5.tif
+  ${TEMP}/bfMeanShiftSmoothingImageFilterSingleThread.tif
+  ${TEMP}/bfMeanShiftSmoothingImageFilterMultiThread.tif
   otbMeanShiftSmoothingImageFilterThreading
-  ${INPUTDATA}/SPOT5_EXTRACTS/Arcachon/Arcachon_extrait_3852_3319_546_542.tif
-  ${TEMP}/bfMeanShiftSmoothingImageFilter2SingleThreading_SPOT5.tif
-  ${TEMP}/bfMeanShiftSmoothingImageFilter2MultiThreading_SPOT5.tif
-  4 10 0
+  ${INPUTDATA}/QB_MUL_ROI_1000_100.tif
+  ${TEMP}/bfMeanShiftSmoothingImageFilterSingleThread.tif
+  ${TEMP}/bfMeanShiftSmoothingImageFilterMultiThread.tif
+  4 50 0
   )

Modules/IO/Carto/src/otbOSMDataToVectorDataGenerator.cxx

@@ -39,7 +39,7 @@ OSMDataToVectorDataGenerator::OSMDataToVectorDataGenerator():m_North(43.62811),
   this->SetNumberOfRequiredOutputs(1);
 
   // Initialize the url
-  m_Url = "http://www.openstreetmap.org/api/0.6/map?";
+  m_Url = "https://www.openstreetmap.org/api/0.6/map?";
 
   m_Curl = CurlHelper::New();
 

Modules/Registration/DisparityMap/test/CMakeLists.txt

@@ -41,7 +41,7 @@ otb_module_target_label(otbDisparityMapTestDriver)
 # Tests Declaration
 
 otb_add_test(NAME dmTvDisparityMapEstimationMethod COMMAND otbDisparityMapTestDriver
-  --compare-ascii ${NOTOL}
+  --compare-ascii ${EPSILON_3}
   ${BASELINE_FILES}/dmDisparityMapEstimationOutput1.txt
   ${TEMP}/dmDisparityMapEstimationOutput1.txt
   otbDisparityMapEstimationMethod
@@ -49,7 +49,7 @@ otb_add_test(NAME dmTvDisparityMapEstimationMethod COMMAND otbDisparityMapTestDr
   ${INPUTDATA}/moving.png
   ${INPUTDATA}/pointSet.png
   ${TEMP}/dmDisparityMapEstimationOutput1.txt
-  20 20
+  10 10
   )
 
 #otb_add_test(NAME dmTvDisparityMapToDEMFilter COMMAND otbDisparityMapTestDriver

Modules/Registration/DisparityMap/test/otbDisparityMapEstimationMethod.cxx

@@ -69,8 +69,7 @@ int otbDisparityMapEstimationMethod(int itkNotUsed(argc), char* argv[])
   typedef itk::MinimumMaximumImageCalculator<ImageType> MinMaxType;
   MinMaxType::Pointer mm = MinMaxType::New();
   mm->SetImage(pointSetReader->GetOutput());
-  mm->ComputeMinimum();
-  mm->ComputeMaximum();
+  mm->Compute();
   std::cout << "min: " << (int) mm->GetMinimum() << " max: " << (int) mm->GetMaximum() << std::endl;
 
   PointSetSourceType::Pointer pointSetSource = PointSetSourceType::New();
@@ -96,7 +95,7 @@ int otbDisparityMapEstimationMethod(int itkNotUsed(argc), char* argv[])
 
   // For gradient descent
   optimizer->SetLearningRate(5.0);
-  optimizer->SetNumberOfIterations(600);
+  optimizer->SetNumberOfIterations(100);
   DMEstimationType::ParametersType initialParameters(transform->GetNumberOfParameters());
   initialParameters[0] = 0.0;  // Initial offset in mm along X
   initialParameters[1] = 0.0;  // Initial offset in mm along Y

Modules/Segmentation/CCOBIA/test/CMakeLists.txt

@@ -70,12 +70,12 @@ otb_add_test(NAME bfTvConnectedComponentMuParserFunctorTestMask COMMAND otbCCOBI
 
 otb_add_test(NAME obTuMeanShiftStreamingConnectedComponentSegmentationOBIAToVectorDataFilter COMMAND otbCCOBIATestDriver
   otbMeanShiftStreamingConnectedComponentSegmentationOBIAToVectorDataFilter
-  ${INPUTDATA}/ROI_QB_MUL_4.tif
+  ${INPUTDATA}/QB_MUL_ROI_1000_100.tif
   ${TEMP}/obTuMeanShiftStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.shp
-  9
-  10
-  0.001
-  "distance<10"
+  6
+  50
+  0.1
+  "distance<20"
   20
   "SHAPE_Elongation>10"
   5)

Modules/Segmentation/MeanShift/test/CMakeLists.txt

@@ -34,13 +34,13 @@ otb_module_target_label(otbMeanShiftTestDriver)
 
 otb_add_test(NAME obTuMeanShiftConnectedComponentSegmentationFilter COMMAND otbMeanShiftTestDriver
   otbMeanShiftConnectedComponentSegmentationFilter
-  ${INPUTDATA}/ROI_QB_MUL_4.tif
-  ${TEMP}/obTuMeanShiftConnectedComponentSegmentationImage.png
-  9
-  9
-  0.01
-  "distance<0.2"
-  50)
+  ${INPUTDATA}/QB_MUL_ROI_1000_100.tif
+  ${TEMP}/obTuMeanShiftConnectedComponentSegmentationImage.tif
+  6
+  50
+  0.1
+  "distance<20"
+  5)
 
 otb_add_test(NAME obTuMeanShiftSegmentationFilterPruning COMMAND otbMeanShiftTestDriver
   otbMeanShiftSegmentationFilter

Modules/ThirdParty/OssimPlugins/include/ossim/ossimSarSensorModel.h

@@ -64,7 +64,7 @@ public:
    : private equality_comparable<ProductType>
    , private less_than_comparable<ProductType>
    {
-     enum Type { SLC, GRD, MGD, GEC, EEC, SCS_B, MAX__, UNDEFINED__, FIRST__=0 };
+     enum Type { SLC, GRD, MGD, GEC, EEC, SCS_B, SCS_U, MAX__, UNDEFINED__, FIRST__=0 };
 
       explicit ProductType(unsigned char value)
          : m_value(Type(value))