Skip to content

Commit e7ebaf4

Browse files
committed
traits: insupported vector<vector<Mat>> for InputArray
1 parent 964a8a9 commit e7ebaf4

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

modules/structured_light/include/opencv2/structured_light/structured_light.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class CV_EXPORTS_W StructuredLightPattern : public virtual Algorithm
7878
@note All the images must be at the same resolution.
7979
*/
8080
CV_WRAP
81-
virtual bool decode( InputArrayOfArrays patternImages, OutputArray disparityMap,
81+
virtual bool decode( const std::vector< std::vector<Mat> >& patternImages, OutputArray disparityMap,
8282
InputArrayOfArrays blackImages = noArray(),
8383
InputArrayOfArrays whiteImages = noArray(),
8484
int flags = DECODE_3D_UNDERWORLD ) const = 0;

modules/structured_light/src/graycodepattern.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class CV_EXPORTS_W GrayCodePattern_Impl : public GrayCodePattern
5656
bool generate( OutputArrayOfArrays patternImages );
5757

5858
// Decodes the gray code pattern, computing the disparity map
59-
bool decode( InputArrayOfArrays patternImages, OutputArray disparityMap, InputArrayOfArrays blackImages = noArray(),
59+
bool decode( const std::vector< std::vector<Mat> >& patternImages, OutputArray disparityMap, InputArrayOfArrays blackImages = noArray(),
6060
InputArrayOfArrays whiteImages = noArray(), int flags = DECODE_3D_UNDERWORLD ) const;
6161

6262
// Returns the number of pattern images for the graycode pattern
@@ -209,10 +209,10 @@ bool GrayCodePattern_Impl::generate( OutputArrayOfArrays pattern )
209209
return true;
210210
}
211211

212-
bool GrayCodePattern_Impl::decode( InputArrayOfArrays patternImages, OutputArray disparityMap,
212+
bool GrayCodePattern_Impl::decode( const std::vector< std::vector<Mat> >& patternImages, OutputArray disparityMap,
213213
InputArrayOfArrays blackImages, InputArrayOfArrays whitheImages, int flags ) const
214214
{
215-
std::vector<std::vector<Mat> >& acquired_pattern = *( std::vector<std::vector<Mat> >* ) patternImages.getObj();
215+
const std::vector<std::vector<Mat> >& acquired_pattern = patternImages;
216216

217217
if( flags == DECODE_3D_UNDERWORLD )
218218
{

modules/structured_light/src/sinusoidalpattern.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class CV_EXPORTS_W SinusoidalPatternProfilometry_Impl : public SinusoidalPattern
5656
// Generate sinusoidal patterns
5757
bool generate( OutputArrayOfArrays patternImages );
5858

59-
bool decode( InputArrayOfArrays patternImages, OutputArray disparityMap,
59+
bool decode( const std::vector< std::vector<Mat> >& patternImages, OutputArray disparityMap,
6060
InputArrayOfArrays blackImages = noArray(), InputArrayOfArrays whiteImages =
6161
noArray(), int flags = 0 ) const;
6262

@@ -258,7 +258,7 @@ bool SinusoidalPatternProfilometry_Impl::generate( OutputArrayOfArrays pattern )
258258
return true;
259259
}
260260

261-
bool SinusoidalPatternProfilometry_Impl::decode( InputArrayOfArrays patternImages,
261+
bool SinusoidalPatternProfilometry_Impl::decode(const std::vector< std::vector<Mat> >& patternImages,
262262
OutputArray disparityMap,
263263
InputArrayOfArrays blackImages,
264264
InputArrayOfArrays whiteImages, int flags ) const

0 commit comments

Comments
 (0)