Merge remote-tracking branch 'origin/develop' into update_superbuild_6.2

Modules/Filtering/Convolution/include/otbConvolutionImageFilter.txx

@@ -124,6 +124,8 @@ ConvolutionImageFilter<TInputImage, TOutputImage, TBoundaryCondition, TFilterPre
   inputIt.GoToBegin();
   unsigned int neighborhoodSize = inputIt.Size();
 
+  double norm_double = 1.;
+  
   // Compute the norm of the filter
   if (m_NormalizeFilter)
     {
@@ -132,6 +134,7 @@ ConvolutionImageFilter<TInputImage, TOutputImage, TBoundaryCondition, TFilterPre
       {
       norm += static_cast<InputRealType>(vcl_abs(m_Filter(i)));
       }
+    norm_double = static_cast<double>(vcl_abs(norm));
     }
 
   while (!inputIt.IsAtEnd())
@@ -146,7 +149,7 @@ ConvolutionImageFilter<TInputImage, TOutputImage, TBoundaryCondition, TFilterPre
     // get the mean value
     if (m_NormalizeFilter)
       {
-      outputIt.Set(static_cast<OutputPixelType>(sum / double(vcl_abs(norm))));
+      outputIt.Set(static_cast<OutputPixelType>(sum / norm_double));
       }
     else
       {

RELEASE_NOTES.txt

@@ -147,7 +147,7 @@ OTB-v.5.8.0 - Changes since version 5.6.1 (November 8th, 2016)
     * 0001300: monteverdi $input_filename crash with relative path
     * 0001303: Memory issue in Monteverdi with images with subdatasets (HDF4)
     * 0001299: Monteverdi shortcuts list needs some updates
-    * 0001291: Word "Échiquier" is not displayed properly in layer stack (effect column)
+    * 0001291: Word "Echiquier" is not displayed properly in layer stack (effect column)
 
   * OTB-Packaging
     * 0001290: Unable to run OTB applications from Mapla.app on Mac OS X
@@ -1758,7 +1758,7 @@ OTB-v.3.12.0 - Changes since version 3.10.0 (2011/01/31)
       are missing)
 
   * Documentation
-    * 0000483: "<" or ">" are interpreted as ¿ in Cookbook
+    * 0000483: "<" or ">" are interpreted as inverted ? in Cookbook
     * 0000370: Cookbook : make a HTML documentation
     * 0000378: Doxygen not updated
 
@@ -2251,10 +2251,10 @@ OTB-v.3.0.0 - Changes since version 2.8.0 (2009/05/11)
 --------------------------------------------------------
 
 * Applications
-  - Urban area extraction (Pléaides, QB, Ikonos, SPOT5). For more
+  - Urban area extraction (Pleaides, QB, Ikonos, SPOT5). For more
     details,
     see the README file
-  - Image to Data Base registration (Pléiades, QB). For more details, see
+  - Image to Data Base registration (Pleiades, QB). For more details, see
     the README file
   - Feature Extraction: add new textures, new radiometric indexes and
     add MeanShift capabilities
@@ -2262,7 +2262,7 @@ OTB-v.3.0.0 - Changes since version 2.8.0 (2009/05/11)
 
 * Library
     The library includes these additions
-  - Cloud detection for QB/Pléiades images
+  - Cloud detection for QB/Pleiades images
   - Alignment and right angle detection (Burns, Grompone)
   - Radiometric indices (vegetation, water, soil)
   - Optimized texture computations including Haralick, SFS, Pantex,

SuperBuild/CMakeLists.txt

@@ -340,6 +340,11 @@ endif()
 
 message(STATUS "OTB_TARGET_SYSTEM_ARCH=${OTB_TARGET_SYSTEM_ARCH}")
 message(STATUS "OTB_TARGET_SYSTEM_ARCH_IS_X64=${OTB_TARGET_SYSTEM_ARCH_IS_X64}")
+if(DOWNLOAD_LOCATION)
+  message(STATUS "Source archives for dependencies will be taken from '${DOWNLOAD_LOCATION}'")
+else()
+  message(STATUS "DOWNLOAD_LOCATION is not set. We will download all source archives during build!")
+endif()
 
 message(STATUS "SuperBuild will be installed to ${CMAKE_INSTALL_PREFIX}")
 message(STATUS "To install to a different directory, re-run cmake -DCMAKE_INSTALL_PREFIX=/your/preferred/path")