opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-15 03:38:39 +08:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander Alekhin
2020-11-17 21:54:27 +00:00
parent f1c3d0e5e7 24a882361d
commit aaf8ba28e2
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/cvv/src/util/observer_ptr.hpp
View File

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

4
modules/phase_unwrapping/include/opencv2/phase_unwrapping/phase_unwrapping.hpp
View File

@@ -58,9 +58,9 @@ public:
/** /**
* @brief Unwraps a 2D phase map. * @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 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 CV_WRAP
virtual void unwrapPhaseMap( InputArray wrappedPhaseMap, OutputArray unwrappedPhaseMap, virtual void unwrapPhaseMap( InputArray wrappedPhaseMap, OutputArray unwrappedPhaseMap,

3
modules/phase_unwrapping/src/histogramphaseunwrapping.cpp
View File

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