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

Merge pull request #2752 from berak:phase_unwrapping_input_type

Browse Source
This commit is contained in:
Alexander Alekhin
2020-11-17 16:03:11 +00:00
parent 088dc142a8 1d84f28202
commit 24a882361d
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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();