Commit e7ebaf42 authored by Alexander Alekhin's avatar Alexander Alekhin

traits: insupported vector<vector<Mat>> for InputArray

parent 964a8a9a
...@@ -78,7 +78,7 @@ class CV_EXPORTS_W StructuredLightPattern : public virtual Algorithm ...@@ -78,7 +78,7 @@ class CV_EXPORTS_W StructuredLightPattern : public virtual Algorithm
@note All the images must be at the same resolution. @note All the images must be at the same resolution.
*/ */
CV_WRAP CV_WRAP
virtual bool decode( InputArrayOfArrays patternImages, OutputArray disparityMap, virtual bool decode( const std::vector< std::vector<Mat> >& patternImages, OutputArray disparityMap,
InputArrayOfArrays blackImages = noArray(), InputArrayOfArrays blackImages = noArray(),
InputArrayOfArrays whiteImages = noArray(), InputArrayOfArrays whiteImages = noArray(),
int flags = DECODE_3D_UNDERWORLD ) const = 0; int flags = DECODE_3D_UNDERWORLD ) const = 0;
......
...@@ -56,7 +56,7 @@ class CV_EXPORTS_W GrayCodePattern_Impl : public GrayCodePattern ...@@ -56,7 +56,7 @@ class CV_EXPORTS_W GrayCodePattern_Impl : public GrayCodePattern
bool generate( OutputArrayOfArrays patternImages ); bool generate( OutputArrayOfArrays patternImages );
// Decodes the gray code pattern, computing the disparity map // Decodes the gray code pattern, computing the disparity map
bool decode( InputArrayOfArrays patternImages, OutputArray disparityMap, InputArrayOfArrays blackImages = noArray(), bool decode( const std::vector< std::vector<Mat> >& patternImages, OutputArray disparityMap, InputArrayOfArrays blackImages = noArray(),
InputArrayOfArrays whiteImages = noArray(), int flags = DECODE_3D_UNDERWORLD ) const; InputArrayOfArrays whiteImages = noArray(), int flags = DECODE_3D_UNDERWORLD ) const;
// Returns the number of pattern images for the graycode pattern // Returns the number of pattern images for the graycode pattern
...@@ -209,10 +209,10 @@ bool GrayCodePattern_Impl::generate( OutputArrayOfArrays pattern ) ...@@ -209,10 +209,10 @@ bool GrayCodePattern_Impl::generate( OutputArrayOfArrays pattern )
return true; return true;
} }
bool GrayCodePattern_Impl::decode( InputArrayOfArrays patternImages, OutputArray disparityMap, bool GrayCodePattern_Impl::decode( const std::vector< std::vector<Mat> >& patternImages, OutputArray disparityMap,
InputArrayOfArrays blackImages, InputArrayOfArrays whitheImages, int flags ) const InputArrayOfArrays blackImages, InputArrayOfArrays whitheImages, int flags ) const
{ {
std::vector<std::vector<Mat> >& acquired_pattern = *( std::vector<std::vector<Mat> >* ) patternImages.getObj(); const std::vector<std::vector<Mat> >& acquired_pattern = patternImages;
if( flags == DECODE_3D_UNDERWORLD ) if( flags == DECODE_3D_UNDERWORLD )
{ {
......
...@@ -56,7 +56,7 @@ public: ...@@ -56,7 +56,7 @@ public:
// Generate sinusoidal patterns // Generate sinusoidal patterns
bool generate( OutputArrayOfArrays patternImages ); bool generate( OutputArrayOfArrays patternImages );
bool decode( InputArrayOfArrays patternImages, OutputArray disparityMap, bool decode( const std::vector< std::vector<Mat> >& patternImages, OutputArray disparityMap,
InputArrayOfArrays blackImages = noArray(), InputArrayOfArrays whiteImages = InputArrayOfArrays blackImages = noArray(), InputArrayOfArrays whiteImages =
noArray(), int flags = 0 ) const; noArray(), int flags = 0 ) const;
...@@ -258,7 +258,7 @@ bool SinusoidalPatternProfilometry_Impl::generate( OutputArrayOfArrays pattern ) ...@@ -258,7 +258,7 @@ bool SinusoidalPatternProfilometry_Impl::generate( OutputArrayOfArrays pattern )
return true; return true;
} }
bool SinusoidalPatternProfilometry_Impl::decode( InputArrayOfArrays patternImages, bool SinusoidalPatternProfilometry_Impl::decode(const std::vector< std::vector<Mat> >& patternImages,
OutputArray disparityMap, OutputArray disparityMap,
InputArrayOfArrays blackImages, InputArrayOfArrays blackImages,
InputArrayOfArrays whiteImages, int flags ) const InputArrayOfArrays whiteImages, int flags ) const
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment