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

Merge branch '2.4'

Browse Source
This commit is contained in:
Andrey Kamaev
2013-04-05 19:52:42 +04:00
parent 3785439917 74e5ff2ec7
commit 67073daf19
154 changed files with 11355 additions and 16795 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/stitching/include/opencv2/stitching/detail/warpers.hpp
View File

@@ -458,7 +458,7 @@ struct SphericalPortraitProjector : ProjectorBase
// Projects image onto unit sphere with origin at (0, 0, 0).
// Poles are located NOT at (0, -1, 0) and (0, 1, 0) points, BUT at (1, 0, 0) and (-1, 0, 0) points.
class SphericalPortraitWarper : public RotationWarperBase<SphericalPortraitProjector>
class CV_EXPORTS SphericalPortraitWarper : public RotationWarperBase<SphericalPortraitProjector>
{
public:
SphericalPortraitWarper(float scale) { projector_.scale = scale; }
@@ -474,7 +474,7 @@ struct CylindricalPortraitProjector : ProjectorBase
};
class CylindricalPortraitWarper : public RotationWarperBase<CylindricalPortraitProjector>
class CV_EXPORTS CylindricalPortraitWarper : public RotationWarperBase<CylindricalPortraitProjector>
{
public:
CylindricalPortraitWarper(float scale) { projector_.scale = scale; }
@@ -493,7 +493,7 @@ struct PlanePortraitProjector : ProjectorBase
};
class PlanePortraitWarper : public RotationWarperBase<PlanePortraitProjector>
class CV_EXPORTS PlanePortraitWarper : public RotationWarperBase<PlanePortraitProjector>
{
public:
PlanePortraitWarper(float scale) { projector_.scale = scale; }

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

@@ -347,8 +347,15 @@ SurfFeaturesFinder::SurfFeaturesFinder(double hess_thresh, int num_octaves, int
void SurfFeaturesFinder::find(const Mat &image, ImageFeatures &features)
{
Mat gray_image;
CV_Assert(image.type() == CV_8UC3);
cvtColor(image, gray_image, CV_BGR2GRAY);
CV_Assert((image.type() == CV_8UC3) || (image.type() == CV_8UC1));
if(image.type() == CV_8UC3)
{
cvtColor(image, gray_image, CV_BGR2GRAY);
}
else
{
gray_image = image;
}
if (surf.empty())
{
detector_->detect(gray_image, features.keypoints);