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

Changed the class OrbFeaturesFinder to make it work with CV_8UC4 and CV_8UC1 images.

Browse Source
This commit is contained in:
Leonid Beynenson 2012-02-27 17:46:53 +00:00
parent a92e3dcdad
commit 9794f5977c
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/stitching/src/matchers.cpp
View File

@ -351,8 +351,18 @@ OrbFeaturesFinder::OrbFeaturesFinder(Size _grid_size, size_t n_features, const O
void OrbFeaturesFinder::find(const Mat &image, ImageFeatures &features) void OrbFeaturesFinder::find(const Mat &image, ImageFeatures &features)
{ {
Mat gray_image; Mat gray_image;
CV_Assert(image.type() == CV_8UC3);
CV_Assert((image.type() == CV_8UC3) || (image.type() == CV_8UC4) || (image.type() == CV_8UC1));
if (image.type() == CV_8UC3) {
cvtColor(image, gray_image, CV_BGR2GRAY); cvtColor(image, gray_image, CV_BGR2GRAY);
} else if (image.type() == CV_8UC4) {
cvtColor(image, gray_image, CV_BGRA2GRAY);
} else if (image.type() == CV_8UC1) {
gray_image=image;
} else {
CV_Assert(false);
}
if (grid_size.area() == 1) if (grid_size.area() == 1)
(*orb)(gray_image, Mat(), features.keypoints, features.descriptors); (*orb)(gray_image, Mat(), features.keypoints, features.descriptors);