potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into bow_desc

Browse Source 
Conflicts:
	modules/features2d/src/bagofwords.cpp
This commit is contained in:
Mathieu Barnachon
2013-11-24 14:21:44 +01:00
parent 464985205c 3ab47300ce
commit 67525627db
2649 changed files with 192492 additions and 87401 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/features2d/src/bagofwords.cpp
+10
View File
@@ -204,4 +204,14 @@ void BOWImgDescriptorExtractor::compute( const Mat& descriptors, Mat& imgDescrip
imgDescriptor /= descriptors.rows;
}
int BOWImgDescriptorExtractor::descriptorSize() const
{
return vocabulary.empty() ? 0 : vocabulary.rows;
}
int BOWImgDescriptorExtractor::descriptorType() const
{
return CV_32FC1;
}
}