generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed ticket #823

Browse Source
This commit is contained in:
Maria Dimashova 2011-01-31 09:51:17 +00:00
parent 152fefe854
commit 1748f65f54
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/features2d/include/opencv2/features2d/features2d.hpp
View File

@ -2620,7 +2620,7 @@ struct CV_EXPORTS DrawMatchesFlags
}; };
// Draw keypoints. // Draw keypoints.
CV_EXPORTS void drawKeypoints( const Mat& image, const vector<KeyPoint>& keypoints, Mat& outImg, CV_EXPORTS void drawKeypoints( const Mat& image, const vector<KeyPoint>& keypoints, Mat& outImage,
const Scalar& color=Scalar::all(-1), int flags=DrawMatchesFlags::DEFAULT ); const Scalar& color=Scalar::all(-1), int flags=DrawMatchesFlags::DEFAULT );
// Draws matches of keypints from two images on output image. // Draws matches of keypints from two images on output image.

19
modules/features2d/src/draw.cpp
View File

@ -88,11 +88,24 @@ static inline void _drawKeypoint( Mat& img, const KeyPoint& p, const Scalar& col
} }
} }
void drawKeypoints( const Mat& image, const vector<KeyPoint>& keypoints, Mat& outImg, void drawKeypoints( const Mat& image, const vector<KeyPoint>& keypoints, Mat& outImage,
const Scalar& _color, int flags ) const Scalar& _color, int flags )
{ {
if( !(flags & DrawMatchesFlags::DRAW_OVER_OUTIMG) ) if( !(flags & DrawMatchesFlags::DRAW_OVER_OUTIMG) )
cvtColor( image, outImg, CV_GRAY2BGR ); {
if( image.type() == CV_8UC3 )
{
image.copyTo( outImage );
}
else if( image.type() == CV_8UC1 )
{
cvtColor( image, outImage, CV_GRAY2BGR );
}
else
{
CV_Error( CV_StsBadArg, "Incorrect type of input image.\n" );
}
}
RNG& rng=theRNG(); RNG& rng=theRNG();
bool isRandColor = _color == Scalar::all(-1); bool isRandColor = _color == Scalar::all(-1);
@ -100,7 +113,7 @@ void drawKeypoints( const Mat& image, const vector<KeyPoint>& keypoints, Mat& ou
for( vector<KeyPoint>::const_iterator i = keypoints.begin(), ie = keypoints.end(); i != ie; ++i ) for( vector<KeyPoint>::const_iterator i = keypoints.begin(), ie = keypoints.end(); i != ie; ++i )
{ {
Scalar color = isRandColor ? Scalar(rng(256), rng(256), rng(256)) : _color; Scalar color = isRandColor ? Scalar(rng(256), rng(256), rng(256)) : _color;
_drawKeypoint( outImg, *i, color, flags ); _drawKeypoint( outImage, *i, color, flags );
} }
} }