Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Mon, 23 Apr 2018 14:54:04 +0000 (17:54 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Mon, 23 Apr 2018 15:45:02 +0000 (18:45 +0300)
1  2 
cmake/OpenCVDetectInferenceEngine.cmake
modules/core/include/opencv2/core/base.hpp
modules/core/include/opencv2/core/private.hpp
modules/core/src/arithm.cpp
modules/core/src/system.cpp
modules/imgproc/include/opencv2/imgproc.hpp
modules/imgproc/src/smooth.cpp
modules/stitching/src/blenders.cpp

@@@ -15,6 -15,10 +15,7 @@@ macro(ie_fail
      return()
  endmacro()
  
 -if(NOT HAVE_CXX11)
 -    ie_fail()
 -endif()
  if(NOT INF_ENGINE_ROOT_DIR OR NOT EXISTS "${INF_ENGINE_ROOT_DIR}/include/inference_engine.hpp")
      set(ie_root_paths "${INF_ENGINE_ROOT_DIR}")
      if(DEFINED ENV{INTEL_CVSDK_DIR})
Simple merge
@@@ -61,8 -61,25 +61,25 @@@ Mutex& getInitializationMutex(
  // force initialization (single-threaded environment)
  Mutex* __initialization_mutex_initializer = &getInitializationMutex();
  
 -#if defined(_DEBUG) || defined(__ANDROID__) || (defined(__GNUC__) && !defined(__EXCEPTIONS))
+ static bool param_dumpErrors = utils::getConfigurationParameterBool("OPENCV_DUMP_ERRORS",
++#if defined(_DEBUG) || defined(__ANDROID__)
+     true
+ #else
+     false
+ #endif
+ );
  } // namespace cv
  
 -#if CV_ERROR_SET_TERMINATE_HANDLER == 0
+ #ifndef CV_ERROR_SET_TERMINATE_HANDLER  // build config option
+ # if defined(_WIN32)
+ #   define CV_ERROR_SET_TERMINATE_HANDLER 1
+ # endif
+ #endif
++#if defined(CV_ERROR_SET_TERMINATE_HANDLER) && !CV_ERROR_SET_TERMINATE_HANDLER
+ # undef CV_ERROR_SET_TERMINATE_HANDLER
+ #endif
  #ifdef _MSC_VER
  # if _MSC_VER >= 1700
  #  pragma warning(disable:4447) // Disable warning 'main' signature found without threading model
Simple merge
Simple merge