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

Merged the trunk r8467:8507 (inclusive) (big bunch of documentation fixes)

Browse Source
This commit is contained in:
Andrey Kamaev
2012-05-30 11:13:07 +00:00
parent 052d2dc23a
commit 81a5988015
120 changed files with 5407 additions and 4695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/stitching/doc/autocalib.rst
View File

@@ -7,13 +7,13 @@ detail::focalsFromHomography
----------------------------
Tries to estimate focal lengths from the given homography under the assumption that the camera undergoes rotations around its centre only.
.. ocv:function:: void focalsFromHomography(const Mat &H, double &f0, double &f1, bool &f0_ok, bool &f1_ok)
.. ocv:function:: void detail::focalsFromHomography(const Mat &H, double &f0, double &f1, bool &f0_ok, bool &f1_ok)
:param H: Homography.
:param f0: Estimated focal length along X axis.
:param f1: Estimated focal length along Y axis.
:param f1: Estimated focal length along Y axis.
:param f0_ok: True, if f0 was estimated successfully, false otherwise.
@@ -23,7 +23,7 @@ detail::estimateFocal
---------------------
Estimates focal lengths for each given camera.
.. ocv:function:: void estimateFocal(const std::vector<ImageFeatures> &features, const std::vector<MatchesInfo> &pairwise_matches, std::vector<double> &focals)
.. ocv:function:: void detail::estimateFocal(const std::vector<ImageFeatures> &features, const std::vector<MatchesInfo> &pairwise_matches, std::vector<double> &focals)
:param features: Features of images.

10
modules/stitching/doc/blenders.rst
View File

@@ -8,7 +8,7 @@ detail::Blender
.. ocv:class:: detail::Blender
Base class for all blenders. ::
class CV_EXPORTS Blender
{
public:
@@ -17,7 +17,7 @@ Base class for all blenders. ::
enum { NO, FEATHER, MULTI_BAND };
static Ptr<Blender> createDefault(int type, bool try_gpu = false);
void prepare(const std::vector<Point> &corners, const std::vector<Size> &sizes);
void prepare(const std::vector<Point> &corners, const std::vector<Size> &sizes);
virtual void prepare(Rect dst_roi);
virtual void feed(const Mat &img, const Mat &mask, Point tl);
virtual void blend(Mat &dst, Mat &dst_mask);
@@ -48,7 +48,7 @@ Processes the image.
:param img: Source image
:param mask: Source image mask
:param tl: Source image top-left corners
detail::Blender::blend
@@ -64,7 +64,7 @@ Blends and returns the final pano.
detail::FeatherBlender
----------------------
.. ocv:class:: detail::FeatherBlender
.. ocv:class:: detail::FeatherBlender : public detail::Blender
Simple blender which mixes images at its borders. ::
@@ -93,7 +93,7 @@ Simple blender which mixes images at its borders. ::
detail::MultiBandBlender
------------------------
.. ocv:class:: detail::MultiBandBlender
.. ocv:class:: detail::MultiBandBlender : public detail::Blender
Blender which uses multi-band blending algorithm (see [BA83]_). ::

2
modules/stitching/doc/camera.rst
View File

@@ -5,7 +5,7 @@ Camera
detail::CameraParams
--------------------
.. ocv:class:: detail::CameraParams
.. ocv:struct:: detail::CameraParams
Describes camera parameters.

28
modules/stitching/doc/exposure_compensation.rst
View File

@@ -3,9 +3,9 @@ Exposure Compensation
.. highlight:: cpp
detail::ExposureCompensation
detail::ExposureCompensator
----------------------------
.. ocv:class:: detail::ExposureCompensation
.. ocv:class:: detail::ExposureCompensator
Base class for all exposure compensators. ::
@@ -24,12 +24,12 @@ Base class for all exposure compensators. ::
virtual void apply(int index, Point corner, Mat &image, const Mat &mask) = 0;
};
detail::ExposureCompensation::feed
detail::ExposureCompensator::feed
----------------------------------
.. ocv:function:: void detail::ExposureCompensation::feed(const std::vector<Point> &corners, const std::vector<Mat> &images, const std::vector<Mat> &masks)
.. ocv:function:: void detail::ExposureCompensator::feed(const std::vector<Point> &corners, const std::vector<Mat> &images, const std::vector<Mat> &masks)
.. ocv:function:: void detail::ExposureCompensation::feed(const std::vector<Point> &corners, const std::vector<Mat> &images, const std::vector<std::pair<Mat,uchar> > &masks)
.. ocv:function:: void detail::ExposureCompensator::feed(const std::vector<Point> &corners, const std::vector<Mat> &images, const std::vector<std::pair<Mat,uchar> > &masks)
:param corners: Source image top-left corners
@@ -37,12 +37,12 @@ detail::ExposureCompensation::feed
:param masks: Image masks to update (second value in pair specifies the value which should be used to detect where image is)
detil::ExposureCompensation::apply
detil::ExposureCompensator::apply
----------------------------------
Compensate exposure in the specified image.
.. ocv:function:: void detail::ExposureCompensation::apply(int index, Point corner, Mat &image, const Mat &mask)
.. ocv:function:: void detail::ExposureCompensator::apply(int index, Point corner, Mat &image, const Mat &mask)
:param index: Image index
@@ -54,7 +54,7 @@ Compensate exposure in the specified image.
detail::NoExposureCompensator
-----------------------------
.. ocv:class:: detail::NoExposureCompensator
.. ocv:class:: detail::NoExposureCompensator : public detail::ExposureCompensator
Stub exposure compensator which does nothing. ::
@@ -66,11 +66,11 @@ Stub exposure compensator which does nothing. ::
void apply(int /*index*/, Point /*corner*/, Mat &/*image*/, const Mat &/*mask*/) {};
};
.. seealso:: :ocv:class:`detail::ExposureCompensation`
.. seealso:: :ocv:class:`detail::ExposureCompensator`
detail::GainCompensator
-----------------------
.. ocv:class:: detail::GainCompensator
.. ocv:class:: detail::GainCompensator : public detail::ExposureCompensator
Exposure compensator which tries to remove exposure related artifacts by adjusting image intensities, see [BL07]_ and [WJ10]_ for details. ::
@@ -86,18 +86,18 @@ Exposure compensator which tries to remove exposure related artifacts by adjusti
/* hidden */
};
.. seealso:: :ocv:class:`detail::ExposureCompensation`
.. seealso:: :ocv:class:`detail::ExposureCompensator`
detail::BlocksGainCompensator
-----------------------------
.. ocv:class:: detail::BlocksGainCompensator
.. ocv:class:: detail::BlocksGainCompensator : public detail::ExposureCompensator
Exposure compensator which tries to remove exposure related artifacts by adjusting image block intensities, see [UES01]_ for details. ::
class CV_EXPORTS BlocksGainCompensator : public ExposureCompensator
{
public:
BlocksGainCompensator(int bl_width = 32, int bl_height = 32)
BlocksGainCompensator(int bl_width = 32, int bl_height = 32)
: bl_width_(bl_width), bl_height_(bl_height) {}
void feed(const std::vector<Point> &corners, const std::vector<Mat> &images,
const std::vector<std::pair<Mat,uchar> > &masks);
@@ -107,5 +107,5 @@ Exposure compensator which tries to remove exposure related artifacts by adjusti
/* hidden */
};
.. seealso:: :ocv:class:`detail::ExposureCompensation`
.. seealso:: :ocv:class:`detail::ExposureCompensator`

6
modules/stitching/doc/high_level.rst
View File

@@ -164,7 +164,7 @@ Image warper factories base class. ::
PlaneWarper
-----------
.. ocv:class:: PlaneWarper
.. ocv:class:: PlaneWarper : public WarperCreator
Plane warper factory class. ::
@@ -178,7 +178,7 @@ Plane warper factory class. ::
CylindricalWarper
-----------------
.. ocv:class:: CylindricalWarper
.. ocv:class:: CylindricalWarper : public WarperCreator
Cylindrical warper factory class. ::
@@ -192,7 +192,7 @@ Cylindrical warper factory class. ::
SphericalWarper
---------------
.. ocv:class:: SphericalWarper
.. ocv:class:: SphericalWarper : public WarperCreator
Spherical warper factory class. ::

34
modules/stitching/doc/matching.rst
View File

@@ -5,7 +5,7 @@ Features Finding and Images Matching
detail::ImageFeatures
-----------------------
.. ocv:struct:: detail::ImageFeatures
.. ocv:struct:: detail::ImageFeatures
Structure containing image keypoints and descriptors. ::
@@ -47,10 +47,10 @@ Finds features in the given image.
:param image: Source image
:param features: Found features
:param rois: Regions of interest
.. seealso:: :ocv:struct:`detail::ImageFeatures`, :ocv:class:`Rect_`
.. seealso:: :ocv:struct:`detail::ImageFeatures`, :ocv:class:`Rect_`
detail::FeaturesFinder::collectGarbage
--------------------------------------
@@ -64,17 +64,17 @@ detail::FeaturesFinder::find
This method must implement features finding logic in order to make the wrappers `detail::FeaturesFinder::operator()`_ work.
.. ocv:function:: void find(const Mat &image, ImageFeatures &features)
.. ocv:function:: void detail::FeaturesFinder::find(const Mat &image, ImageFeatures &features)
:param image: Source image
:param features: Found features
.. seealso:: :ocv:struct:`detail::ImageFeatures`
detail::SurfFeaturesFinder
--------------------------
.. ocv:class:: detail::SurfFeaturesFinder
.. ocv:class:: detail::SurfFeaturesFinder : public detail::FeaturesFinder
SURF features finder. ::
@@ -92,14 +92,14 @@ SURF features finder. ::
detail::OrbFeaturesFinder
-------------------------
.. ocv:class:: detail::OrbFeaturesFinder
.. ocv:class:: detail::OrbFeaturesFinder : public detail::FeaturesFinder
ORB features finder. ::
class CV_EXPORTS OrbFeaturesFinder : public FeaturesFinder
{
public:
OrbFeaturesFinder(Size _grid_size = Size(3,1), size_t n_features = 1500,
OrbFeaturesFinder(Size _grid_size = Size(3,1), size_t n_features = 1500,
const ORB::CommonParams &detector_params = ORB::CommonParams(1.3f, 5));
private:
@@ -139,10 +139,10 @@ Feature matchers base class. ::
public:
virtual ~FeaturesMatcher() {}
void operator ()(const ImageFeatures &features1, const ImageFeatures &features2,
void operator ()(const ImageFeatures &features1, const ImageFeatures &features2,
MatchesInfo& matches_info) { match(features1, features2, matches_info); }
void operator ()(const std::vector<ImageFeatures> &features, std::vector<MatchesInfo> &pairwise_matches,
void operator ()(const std::vector<ImageFeatures> &features, std::vector<MatchesInfo> &pairwise_matches,
const Mat &mask = cv::Mat());
bool isThreadSafe() const { return is_thread_safe_; }
@@ -152,7 +152,7 @@ Feature matchers base class. ::
protected:
FeaturesMatcher(bool is_thread_safe = false) : is_thread_safe_(is_thread_safe) {}
virtual void match(const ImageFeatures &features1, const ImageFeatures &features2,
virtual void match(const ImageFeatures &features1, const ImageFeatures &features2,
MatchesInfo& matches_info) = 0;
bool is_thread_safe_;
@@ -171,8 +171,8 @@ Performs images matching.
:param matches_info: Found matches
.. ocv:function:: void detail::FeaturesMatcher::operator ()(const std::vector<ImageFeatures> &features, std::vector<MatchesInfo> &pairwise_matches, const Mat &mask)
.. ocv:function:: void detail::FeaturesMatcher::operator ()( const std::vector<ImageFeatures> & features, std::vector<MatchesInfo> & pairwise_matches, const Mat & mask=Mat() )
:param features: Features of the source images
:param pairwise_matches: Found pairwise matches
@@ -205,21 +205,21 @@ This method must implement matching logic in order to make the wrappers `detail:
.. ocv:function:: void detail::FeaturesMatcher::match(const ImageFeatures &features1, const ImageFeatures &features2, MatchesInfo& matches_info)
:param features1: First image features
:param features2: Second image features
:param matches_info: Found matches
detail::BestOf2NearestMatcher
-----------------------------
.. ocv:class:: detail::BestOf2NearestMatcher
.. ocv:class:: detail::BestOf2NearestMatcher : public detail::FeaturesMatcher
Features matcher which finds two best matches for each feature and leaves the best one only if the ratio between descriptor distances is greater than the threshold ``match_conf``. ::
class CV_EXPORTS BestOf2NearestMatcher : public FeaturesMatcher
{
public:
BestOf2NearestMatcher(bool try_use_gpu = false, float match_conf = 0.65f,
BestOf2NearestMatcher(bool try_use_gpu = false, float match_conf = 0.65f,
int num_matches_thresh1 = 6, int num_matches_thresh2 = 6);
void collectGarbage();
@@ -239,7 +239,7 @@ detail::BestOf2NearestMatcher::BestOf2NearestMatcher
Constructs a "best of 2 nearest" matcher.
.. ocv:function:: detail::BestOf2NearestMatcher::BestOf2NearestMatcher(bool try_use_gpu = false, float match_conf = 0.65f, int num_matches_thresh1 = 6, int num_matches_thresh2 = 6)
.. ocv:function:: detail::BestOf2NearestMatcher::BestOf2NearestMatcher(bool try_use_gpu = false, float match_conf = 0.3f, int num_matches_thresh1 = 6, int num_matches_thresh2 = 6)
:param try_use_gpu: Should try to use GPU or not

39
modules/stitching/doc/motion_estimation.rst
View File

@@ -7,9 +7,9 @@ detail::Estimator
-----------------
.. ocv:class:: detail::Estimator
Rotation estimator base class. It takes features of all images, pairwise matches between all images and estimates rotations of all cameras.
Rotation estimator base class. It takes features of all images, pairwise matches between all images and estimates rotations of all cameras.
.. note:: The coordinate system origin is implementation-dependent, but you can always normalize the rotations in respect to the first camera, for instance.
.. note:: The coordinate system origin is implementation-dependent, but you can always normalize the rotations in respect to the first camera, for instance.
::
@@ -18,12 +18,12 @@ Rotation estimator base class. It takes features of all images, pairwise matches
public:
virtual ~Estimator() {}
void operator ()(const std::vector<ImageFeatures> &features, const std::vector<MatchesInfo> &pairwise_matches,
void operator ()(const std::vector<ImageFeatures> &features, const std::vector<MatchesInfo> &pairwise_matches,
std::vector<CameraParams> &cameras)
{ estimate(features, pairwise_matches, cameras); }
protected:
virtual void estimate(const std::vector<ImageFeatures> &features, const std::vector<MatchesInfo> &pairwise_matches,
virtual void estimate(const std::vector<ImageFeatures> &features, const std::vector<MatchesInfo> &pairwise_matches,
std::vector<CameraParams> &cameras) = 0;
};
@@ -55,7 +55,7 @@ This method must implement camera parameters estimation logic in order to make t
detail::HomographyBasedEstimator
--------------------------------
.. ocv:class:: detail::HomographyBasedEstimator
.. ocv:class:: detail::HomographyBasedEstimator : public detail::Estimator
Homography based rotation estimator. ::
@@ -71,7 +71,7 @@ Homography based rotation estimator. ::
detail::BundleAdjusterBase
--------------------------
.. ocv:class:: detail::BundleAdjusterBase
.. ocv:class:: detail::BundleAdjusterBase : public detail::Estimator
Base class for all camera parameters refinement methods. ::
@@ -79,10 +79,10 @@ Base class for all camera parameters refinement methods. ::
{
public:
const Mat refinementMask() const { return refinement_mask_.clone(); }
void setRefinementMask(const Mat &mask)
{
void setRefinementMask(const Mat &mask)
{
CV_Assert(mask.type() == CV_8U && mask.size() == Size(3, 3));
refinement_mask_ = mask.clone();
refinement_mask_ = mask.clone();
}
double confThresh() const { return conf_thresh_; }
@@ -92,17 +92,17 @@ Base class for all camera parameters refinement methods. ::
void setTermCriteria(const CvTermCriteria& term_criteria) { term_criteria_ = term_criteria; }
protected:
BundleAdjusterBase(int num_params_per_cam, int num_errs_per_measurement)
: num_params_per_cam_(num_params_per_cam),
num_errs_per_measurement_(num_errs_per_measurement)
{
BundleAdjusterBase(int num_params_per_cam, int num_errs_per_measurement)
: num_params_per_cam_(num_params_per_cam),
num_errs_per_measurement_(num_errs_per_measurement)
{
setRefinementMask(Mat::ones(3, 3, CV_8U));
setConfThresh(1.);
setConfThresh(1.);
setTermCriteria(cvTermCriteria(CV_TERMCRIT_EPS + CV_TERMCRIT_ITER, 1000, DBL_EPSILON));
}
// Runs bundle adjustment
virtual void estimate(const std::vector<ImageFeatures> &features,
virtual void estimate(const std::vector<ImageFeatures> &features,
const std::vector<MatchesInfo> &pairwise_matches,
std::vector<CameraParams> &cameras);
@@ -146,7 +146,7 @@ Construct a bundle adjuster base instance.
.. ocv:function:: detail::BundleAdjusterBase::BundleAdjusterBase(int num_params_per_cam, int num_errs_per_measurement)
:param num_params_per_cam: Number of parameters per camera
:param num_errs_per_measurement: Number of error terms (components) per match
detail::BundleAdjusterBase::setUpInitialCameraParams
@@ -187,7 +187,7 @@ Gets the refined camera parameters.
detail::BundleAdjusterReproj
----------------------------
.. ocv:class:: detail::BundleAdjusterReproj
.. ocv:class:: detail::BundleAdjusterReproj : public detail::BundleAdjusterBase
Implementation of the camera parameters refinement algorithm which minimizes sum of the reprojection error squares. ::
@@ -204,7 +204,7 @@ Implementation of the camera parameters refinement algorithm which minimizes sum
detail::BundleAdjusterRay
-------------------------
.. ocv:class:: detail::BundleAdjusterRay
.. ocv:class:: detail::BundleAdjusterRay : public detail::BundleAdjusterBase
Implementation of the camera parameters refinement algorithm which minimizes sum of the distances between the rays passing through the camera center and a feature. ::
@@ -221,7 +221,6 @@ Implementation of the camera parameters refinement algorithm which minimizes sum
detail::WaveCorrectKind
-----------------------
.. ocv:class:: detail::WaveCorrectKind
Wave correction kind. ::
@@ -235,7 +234,7 @@ detail::waveCorrect
-------------------
Tries to make panorama more horizontal (or vertical).
.. ocv:function:: void waveCorrect(std::vector<Mat> &rmats, WaveCorrectKind kind)
.. ocv:function:: void detail::waveCorrect(std::vector<Mat> &rmats, WaveCorrectKind kind)
:param rmats: Camera rotation matrices.

8
modules/stitching/doc/seam_estimation.rst
View File

@@ -33,7 +33,7 @@ Estimates seams.
detail::NoSeamFinder
--------------------
.. ocv:class:: detail::NoSeamFinder
.. ocv:class:: detail::NoSeamFinder : public detail::SeamFinder
Stub seam estimator which does nothing. ::
@@ -47,7 +47,7 @@ Stub seam estimator which does nothing. ::
detail::PairwiseSeamFinder
--------------------------
.. ocv:class:: detail::PairwiseSeamFinder
.. ocv:class:: detail::PairwiseSeamFinder : public detail::SeamFinder
Base class for all pairwise seam estimators. ::
@@ -84,7 +84,7 @@ Resolves masks intersection of two specified images in the given ROI.
detail::VoronoiSeamFinder
-------------------------
.. ocv:class:: detail::VoronoiSeamFinder
.. ocv:class:: detail::VoronoiSeamFinder : public detail::PairwiseSeamFinder
Voronoi diagram-based seam estimator. ::
@@ -113,7 +113,7 @@ Base class for all minimum graph-cut-based seam estimators. ::
detail::GraphCutSeamFinder
--------------------------
.. ocv:class:: detail::GraphCutSeamFinder
.. ocv:class:: detail::GraphCutSeamFinder : public detail::GraphCutSeamFinderBase, public detail::SeamFinder
Minimum graph cut-based seam estimator. See details in [V03]_. ::

34
modules/stitching/doc/warpers.rst
View File

@@ -20,7 +20,7 @@ Rotation-only model image warper interface. ::
virtual Point warp(const Mat &src, const Mat &K, const Mat &R, int interp_mode, int border_mode,
Mat &dst) = 0;
virtual void warpBackward(const Mat &src, const Mat &K, const Mat &R, int interp_mode, int border_mode,
Size dst_size, Mat &dst) = 0;
@@ -35,7 +35,7 @@ Projects the image point.
.. ocv:function:: Point2f detail::RotationWarper::warpPoint(const Point2f &pt, const Mat &K, const Mat &R)
:param pt: Source point
:param K: Camera intrinsic parameters
:param R: Camera rotation matrix
@@ -50,7 +50,7 @@ Builds the projection maps according to the given camera data.
.. ocv:function:: Rect detail::RotationWarper::buildMaps(Size src_size, const Mat &K, const Mat &R, Mat &xmap, Mat &ymap)
:param src_size: Source image size
:param K: Camera intrinsic parameters
:param R: Camera rotation matrix
@@ -66,10 +66,10 @@ detail::RotationWarper::warp
Projects the image.
.. ocv:function:: Point detal::RotationWarper::warp(const Mat &src, const Mat &K, const Mat &R, int interp_mode, int border_mode, Mat &dst)
.. ocv:function:: Point detail::RotationWarper::warp(const Mat &src, const Mat &K, const Mat &R, int interp_mode, int border_mode, Mat &dst)
:param src: Source image
:param K: Camera intrinsic parameters
:param R: Camera rotation matrix
@@ -109,7 +109,7 @@ detail::RotationWarper::warpRoi
.. ocv:function:: Rect detail::RotationWarper::warpRoi(Size src_size, const Mat &K, const Mat &R)
:param src_size: Source image bounding box
:param K: Camera intrinsic parameters
:param R: Camera rotation matrix
@@ -124,8 +124,8 @@ Base class for warping logic implementation. ::
struct CV_EXPORTS ProjectorBase
{
void setCameraParams(const Mat &K = Mat::eye(3, 3, CV_32F),
const Mat &R = Mat::eye(3, 3, CV_32F),
void setCameraParams(const Mat &K = Mat::eye(3, 3, CV_32F),
const Mat &R = Mat::eye(3, 3, CV_32F),
const Mat &T = Mat::zeros(3, 1, CV_32F));
float scale;
@@ -144,10 +144,10 @@ Base class for rotation-based warper using a `detail::ProjectorBase`_ derived cl
template <class P>
class CV_EXPORTS RotationWarperBase : public RotationWarper
{
{
public:
Point2f warpPoint(const Point2f &pt, const Mat &K, const Mat &R);
Rect buildMaps(Size src_size, const Mat &K, const Mat &R, Mat &xmap, Mat &ymap);
Point warp(const Mat &src, const Mat &K, const Mat &R, int interp_mode, int border_mode,
@@ -172,7 +172,7 @@ Base class for rotation-based warper using a `detail::ProjectorBase`_ derived cl
detail::PlaneWarper
-------------------
.. ocv:class:: detail::PlaneWarper
.. ocv:class:: detail::PlaneWarper : public detail::RotationWarperBase<PlaneProjector>
Warper that maps an image onto the z = 1 plane. ::
@@ -209,7 +209,7 @@ Construct an instance of the plane warper class.
detail::SphericalWarper
-----------------------
.. ocv:class:: detail::SphericalWarper
.. ocv:class:: detail::SphericalWarper : public detail::RotationWarperBase<SphericalProjector>
Warper that maps an image onto the unit sphere located at the origin. ::
@@ -232,13 +232,13 @@ Construct an instance of the spherical warper class.
.. ocv:function:: void detail::SphericalWarper::SphericalWarper(float scale)
:param scale: Projected image scale multiplier
detail::CylindricalWarper
-------------------------
.. ocv:class:: detail::CylindricalWarper
.. ocv:class:: detail::CylindricalWarper : public detail::RotationWarperBase<CylindricalProjector>
Warper that maps an image onto the x*x + z*z = 1 cylinder. ::
class CV_EXPORTS CylindricalWarper : public RotationWarperBase<CylindricalProjector>
{
public:
@@ -246,8 +246,8 @@ Warper that maps an image onto the x*x + z*z = 1 cylinder. ::
protected:
void detectResultRoi(Size src_size, Point &dst_tl, Point &dst_br)
{
RotationWarperBase<CylindricalProjector>::detectResultRoiByBorder(src_size, dst_tl, dst_br);
{
RotationWarperBase<CylindricalProjector>::detectResultRoiByBorder(src_size, dst_tl, dst_br);
}
};

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

@@ -75,8 +75,8 @@ public:
struct CV_EXPORTS ProjectorBase
{
void setCameraParams(const Mat &K = Mat::eye(3, 3, CV_32F),
const Mat &R = Mat::eye(3, 3, CV_32F),
void setCameraParams(const Mat &K = Mat::eye(3, 3, CV_32F),
const Mat &R = Mat::eye(3, 3, CV_32F),
const Mat &T = Mat::zeros(3, 1, CV_32F));
float scale;
@@ -90,10 +90,10 @@ struct CV_EXPORTS ProjectorBase
template <class P>
class CV_EXPORTS RotationWarperBase : public RotationWarper
{
{
public:
Point2f warpPoint(const Point2f &pt, const Mat &K, const Mat &R);
Rect buildMaps(Size src_size, const Mat &K, const Mat &R, Mat &xmap, Mat &ymap);
Point warp(const Mat &src, const Mat &K, const Mat &R, int interp_mode, int border_mode,
@@ -179,8 +179,8 @@ public:
protected:
void detectResultRoi(Size src_size, Point &dst_tl, Point &dst_br)
{
RotationWarperBase<CylindricalProjector>::detectResultRoiByBorder(src_size, dst_tl, dst_br);
{
RotationWarperBase<CylindricalProjector>::detectResultRoiByBorder(src_size, dst_tl, dst_br);
}
};
@@ -225,11 +225,11 @@ struct CV_EXPORTS CompressedRectilinearProjector : ProjectorBase
class CV_EXPORTS CompressedRectilinearWarper : public RotationWarperBase<CompressedRectilinearProjector>
{
public:
CompressedRectilinearWarper(float scale, float A = 1, float B = 1)
{
CompressedRectilinearWarper(float scale, float A = 1, float B = 1)
{
projector_.a = A;
projector_.b = B;
projector_.scale = scale;
projector_.scale = scale;
}
};
@@ -246,11 +246,11 @@ struct CV_EXPORTS CompressedRectilinearPortraitProjector : ProjectorBase
class CV_EXPORTS CompressedRectilinearPortraitWarper : public RotationWarperBase<CompressedRectilinearPortraitProjector>
{
public:
CompressedRectilinearPortraitWarper(float scale, float A = 1, float B = 1)
{
CompressedRectilinearPortraitWarper(float scale, float A = 1, float B = 1)
{
projector_.a = A;
projector_.b = B;
projector_.scale = scale;
projector_.scale = scale;
}
};
@@ -267,11 +267,11 @@ struct CV_EXPORTS PaniniProjector : ProjectorBase
class CV_EXPORTS PaniniWarper : public RotationWarperBase<PaniniProjector>
{
public:
PaniniWarper(float scale, float A = 1, float B = 1)
{
PaniniWarper(float scale, float A = 1, float B = 1)
{
projector_.a = A;
projector_.b = B;
projector_.scale = scale;
projector_.scale = scale;
}
};
@@ -288,11 +288,11 @@ struct CV_EXPORTS PaniniPortraitProjector : ProjectorBase
class CV_EXPORTS PaniniPortraitWarper : public RotationWarperBase<PaniniPortraitProjector>
{
public:
PaniniPortraitWarper(float scale, float A = 1, float B = 1)
{
PaniniPortraitWarper(float scale, float A = 1, float B = 1)
{
projector_.a = A;
projector_.b = B;
projector_.scale = scale;
projector_.scale = scale;
}
};
@@ -478,8 +478,8 @@ public:
protected:
void detectResultRoi(Size src_size, Point &dst_tl, Point &dst_br)
{
RotationWarperBase<CylindricalPortraitProjector>::detectResultRoiByBorder(src_size, dst_tl, dst_br);
{
RotationWarperBase<CylindricalPortraitProjector>::detectResultRoiByBorder(src_size, dst_tl, dst_br);
}
};
@@ -497,8 +497,8 @@ public:
protected:
void detectResultRoi(Size src_size, Point &dst_tl, Point &dst_br)
{
RotationWarperBase<PlanePortraitProjector>::detectResultRoiByBorder(src_size, dst_tl, dst_br);
{
RotationWarperBase<PlanePortraitProjector>::detectResultRoiByBorder(src_size, dst_tl, dst_br);
}
};