Merge remote-tracking branch 'upstream/3.4' into merge-3.4

modules/cvv/src/util/observer_ptr.hpp

@@ -11,6 +11,7 @@
 #include <cstddef>   //size_t
 #include <cstdint>   // [u]intXX_t
 #include <algorithm> // since some people like to forget that one
+#include <stdexcept>
 
 namespace cvv
 {

modules/phase_unwrapping/include/opencv2/phase_unwrapping/phase_unwrapping.hpp

@@ -58,9 +58,9 @@ public:
     /**
      * @brief Unwraps a 2D phase map.
 
-     * @param wrappedPhaseMap The wrapped phase map that needs to be unwrapped.
+     * @param wrappedPhaseMap The wrapped phase map of type CV_32FC1 that needs to be unwrapped.
      * @param unwrappedPhaseMap The unwrapped phase map.
-     * @param shadowMask Optional parameter used when some pixels do not hold any phase information in the wrapped phase map.
+     * @param shadowMask Optional CV_8UC1 mask image used when some pixels do not hold any phase information in the wrapped phase map.
      */
     CV_WRAP
     virtual void unwrapPhaseMap( InputArray wrappedPhaseMap, OutputArray unwrappedPhaseMap,

modules/phase_unwrapping/src/histogramphaseunwrapping.cpp

@@ -402,6 +402,9 @@ void HistogramPhaseUnwrapping_Impl::unwrapPhaseMap( InputArray wrappedPhaseMap,
         temp.copyTo(mask);
     }
 
+    CV_CheckTypeEQ(wPhaseMap.type(), CV_32FC1, "");
+    CV_CheckTypeEQ(mask.type(), CV_8UC1, "");
+
     computePixelsReliability(wPhaseMap, mask);
     computeEdgesReliabilityAndCreateHistogram();