Commit 27acba74 authored by Cédric Traizet's avatar Cédric Traizet

MRG: sync with develop

parents 0fdadb1d dc9f0c88
Pipeline #2870 passed with stages
in 68 minutes and 54 seconds
......@@ -42,9 +42,8 @@ set(OTB_MIN_MSVC_VER 19)
set(OTB_MIN_Clang_VER 3.4)
if(DEFINED OTB_MIN_${CMAKE_CXX_COMPILER_ID}_VER)
if(CMAKE_CXX_COMPILER_VERSION AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${OTB_MIN_${CMAKE_CXX_COMPILER_ID}_VER})
message(STATUS "WARNING: the version of your ${CMAKE_CXX_COMPILER_ID} "
"compiler is not supported by Orfeo ToolBox (C++14 support might be "
"incomplete). Please consider updating your compiler to version "
message(FATAL_ERROR "The version of your ${CMAKE_CXX_COMPILER_ID} "
"compiler is not supported by Orfeo ToolBox. Please consider updating your compiler to version "
"${OTB_MIN_${CMAKE_CXX_COMPILER_ID}_VER} or later.")
endif()
endif()
......
......@@ -84,6 +84,9 @@ GNU/Linux and macOS
Setting up the build environment
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Note: On some distibutions, gcc 5+ is not available by default. For example in CentOS 7 the default version
is 4.8 (gcc 7 can be installed using devtoolset, see devtoolset6_ and devtoolset7_).
The first thing to do is to create a directory for working with OTB.
This guide will use ``~/OTB`` but you are free to choose something
else. In this directory, there will be three locations:
......@@ -403,3 +406,5 @@ Then, build the target:
make CookbookHTML
.. _devtoolset6: https://www.softwarecollections.org/en/scls/rhscl/devtoolset-6/
.. _devtoolset7: https://www.softwarecollections.org/en/scls/rhscl/devtoolset-7/
......@@ -146,9 +146,9 @@ int otbBandMathXImageFilter(int itkNotUsed(argc), char* itkNotUsed(argv)[])
<< " Result = " << itoutput1.Get()[0] << " Expected = " << expected1 << std::endl; */
error1 = (result1 - expected1) * (result1 - expected1) / (result1 + expected1);
error2 = (result2 - expected2) * (result2 - expected2) / (result2 + expected2);
error3 = (result3 - expected3) * (result3 - expected3) / (result3 + expected3);
error1 = (result1 - expected1) * (result1 - expected1) / abs(result1 + expected1);
error2 = (result2 - expected2) * (result2 - expected2) / abs(result2 + expected2);
error3 = (result3 - expected3) * (result3 - expected3) / abs(result3 + expected3);
if ((error1 > 1E-9) || (error2 > 1E-9) || (error3 > 1E-9))
{
......
Markdown is supported
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