Browse Source

Merge pull request #2752 from berak:phase_unwrapping_input_type

pull/2755/head
Alexander Alekhin 5 years ago
parent
commit
24a882361d
  1. 4
      modules/phase_unwrapping/include/opencv2/phase_unwrapping/phase_unwrapping.hpp
  2. 3
      modules/phase_unwrapping/src/histogramphaseunwrapping.cpp

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

@ -58,9 +58,9 @@ public: @@ -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,

3
modules/phase_unwrapping/src/histogramphaseunwrapping.cpp

@ -402,6 +402,9 @@ void HistogramPhaseUnwrapping_Impl::unwrapPhaseMap( InputArray wrappedPhaseMap, @@ -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();

Loading…
Cancel
Save