Merge branch 'develop' into deprecated_classes

CMake/CTestCustom.cmake.in

@@ -63,6 +63,7 @@ set(CTEST_CUSTOM_WARNING_EXCEPTION
   # other warning expression:
   "[0-9,]+ warnings? generated."
   ".*include.opencv2.*warning.*"
+  ".*include.opencv2.*note.*"
   ".*include.kml.*warning.*"
   ".*include.ogr_feature.*warning.*"
   ".*itksys.SharedForward.h.*warning.*"
@@ -71,6 +72,7 @@ set(CTEST_CUSTOM_WARNING_EXCEPTION
   ".*include.ITK-4.*warning.*"
   ".*include.curl.curl.h.*warning.*"
   ".*include.ossim.*warning.*"
+  ".*include.ossim.*note.*"
   ".*include.ogr_core.h.*warning.*"
   ".*include.ogr_srs_api.h.*warning.*"
   ".*include.ogrsf_frmts.h.*warning.*"
@@ -79,4 +81,5 @@ set(CTEST_CUSTOM_WARNING_EXCEPTION
   ".*include.cpl_error.h.*warning.*"
   ".*vnl.vnl_numeric_traits.h.*warning.*"
   ".*vcl_config_compiler.h.*warning.*"
+  ".*boost.move.unique_ptr.hpp:.*"
   )

Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.txx

@@ -143,9 +143,11 @@ inline
 void otb::ogr::Feature::SetGeometryDirectly(UniqueGeometryPtr geometry)
 {
   CheckInvariants();
+  #if !defined(NDEBUG)
   OGRGeometry * g = geometry.get();
-  UncheckedSetGeometryDirectly(otb::move(geometry));
   itkAssertOrThrowMacro((m_Feature->GetGeometryRef() == g), "The new geometry hasn't been set as expected");
+  #endif
+  UncheckedSetGeometryDirectly(otb::move(geometry));
   itkAssertOrThrowMacro(!geometry, "UniqueGeometryPtr hasn't released its pointer");
 }
 

Modules/Applications/AppClassification/test/CMakeLists.txt

@@ -407,9 +407,9 @@ otb_test_application(NAME apTvFusionOfClassificationsDSPrecision6Inputs
 
 otb_test_application(NAME apTvFusionOfClassificationsMV3Inputs
                      APP  FusionOfClassifications
-                     OPTIONS -il ${OTBAPP_BASELINE}/clLabeledImageQB123_1.tif
-                                 ${OTBAPP_BASELINE}/clLabeledImageQB456_1.tif
-                                 ${OTBAPP_BASELINE}/clLabeledImageQB1.tif
+                     OPTIONS -il ${INPUTDATA}/Classification/clLabeledImageQB123_1.tif
+                                 ${INPUTDATA}/Classification/clLabeledImageQB456_1.tif
+                                 ${INPUTDATA}/Classification/clLabeledImageQB1.tif
                              -method majorityvoting
                              -undecidedlabel 100
                              -out ${TEMP}/apTvFusionOfClassificationsMV3InputsOutput.tif uint16
@@ -488,8 +488,8 @@ otb_test_application(NAME apTvFusionOfClassificationsDSAccuracy6Inputs
 
 otb_test_application(NAME apTvFusionOfClassificationsMV2Inputs
                      APP  FusionOfClassifications
-                     OPTIONS -il ${OTBAPP_BASELINE}/clLabeledImageQB123_1.tif
-                                 ${OTBAPP_BASELINE}/clLabeledImageQB456_1.tif
+                     OPTIONS -il ${INPUTDATA}/Classification/clLabeledImageQB123_1.tif
+                                 ${INPUTDATA}/Classification/clLabeledImageQB456_1.tif
                              -method majorityvoting
                              -undecidedlabel 100
                              -out ${TEMP}/apTvFusionOfClassificationsMV2InputsOutput.tif uint16

Modules/Core/Common/include/otbDecimateImageFilter.txx

@@ -113,7 +113,7 @@ template <class TInputImage, class TOutputImage>
 void
 DecimateImageFilter<TInputImage, TOutputImage>
 ::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
-                       itk::ThreadIdType threadId)
+                       itk::ThreadIdType itkNotUsed(threadId))
 {
   InputImageRegionType inputRegionForThread;
   this->CallCopyOutputRegionToInputRegion(inputRegionForThread, outputRegionForThread);

Modules/Core/Common/include/otbDotProductImageFilter.h

@@ -43,7 +43,7 @@ public:
   DotProductFunctor() {}
   virtual ~DotProductFunctor() {}
 
-  bool operator !=(const DotProductFunctor& other) const
+  bool operator !=(const DotProductFunctor& itkNotUsed(other)) const
   {
     return false;
   }

Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.h

@@ -142,6 +142,14 @@ private:
 /** \class ShiftScaleVectorImageFilter
  *  \brief This filter performs a shift and scaling of a vector image on a per band basis.
  *
+ *  For each band, the following formula is applied :
+ *
+ *  \f[ output = \frac{input - shift}{scale} \f]
+ *
+ *  Beware that the behaviour differs from itk::ShiftScaleImageFilter
+ *  (which add shift instead of subtracting it).
+ *
+ *  \sa VectorShiftScale
  *  \ingroup IntensityImageFilters
  *  \ingroup MultiThreaded
  *

Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.h

@@ -31,6 +31,9 @@ namespace Statistics {
  *
  *  \f[ output = \frac{input - shift}{scale} \f]
  *
+ *  Beware that the behaviour differs from itk::ShiftScaleImageFilter
+ *  (which add shift instead of subtracting it).
+ *
  * Standard casting is applied between input and output type.
  *
  * Shifts and scales can be set via the SetShift() and SetScales() methods.

Modules/Filtering/Wavelet/src/otbWaveletGenerator.cxx

@@ -45,7 +45,7 @@ WaveletGenerator<TMotherWaveletOperator>
 template <Wavelet::Wavelet TMotherWaveletOperator>
 void
 WaveletGenerator<TMotherWaveletOperator>
-::GetLowPassCoefficientVector(CoefficientVector& coeff) const
+::GetLowPassCoefficientVector(CoefficientVector& itkNotUsed(coeff)) const
 {
   std::ostringstream msg;
   msg << "The mother wavelet ID " << TMotherWaveletOperator;
@@ -56,7 +56,7 @@ WaveletGenerator<TMotherWaveletOperator>
 template <Wavelet::Wavelet TMotherWaveletOperator>
 void
 WaveletGenerator<TMotherWaveletOperator>
-::GetHighPassCoefficientVector(CoefficientVector& coeff) const
+::GetHighPassCoefficientVector(CoefficientVector& itkNotUsed(coeff)) const
 {
   std::ostringstream msg;
   msg << "The mother wavelet ID " << TMotherWaveletOperator;