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

replaced "const InputArray&" => "InputArray"; made InputArray and OutputArray references. added "None()" constant (no array()).

Browse Source
This commit is contained in:
Vadim Pisarevsky
2011-06-06 14:51:27 +00:00
parent 6dc7ae0ff6
commit 0c877f62e9
68 changed files with 757 additions and 750 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/video/src/bgfg_gaussmix.cpp
View File

@@ -59,7 +59,7 @@ namespace cv
{
BackgroundSubtractor::~BackgroundSubtractor() {}
void BackgroundSubtractor::operator()(const InputArray&, OutputArray, double)
void BackgroundSubtractor::operator()(InputArray, OutputArray, double)
{
}
@@ -385,7 +385,7 @@ static void process8uC3( BackgroundSubtractorMOG& obj, const Mat& image, Mat& fg
}
}
void BackgroundSubtractorMOG::operator()(const InputArray& _image, OutputArray _fgmask, double learningRate)
void BackgroundSubtractorMOG::operator()(InputArray _image, OutputArray _fgmask, double learningRate)
{
Mat image = _image.getMat();
bool needToInitialize = nframes == 0 || learningRate >= 1 || image.size() != frameSize || image.type() != frameType;

2
modules/video/src/bgfg_gaussmix2.cpp
View File

@@ -1257,7 +1257,7 @@ void BackgroundSubtractorMOG2::initialize(Size _frameSize, int _frameType)
bgmodelUsedModes = Scalar::all(0);
}
void BackgroundSubtractorMOG2::operator()(const InputArray& _image, OutputArray _fgmask, double learningRate)
void BackgroundSubtractorMOG2::operator()(InputArray _image, OutputArray _fgmask, double learningRate)
{
Mat image = _image.getMat();
bool needToInitialize = nframes == 0 || learningRate >= 1 || image.size() != frameSize || image.type() != frameType;

4
modules/video/src/camshift.cpp
View File

@@ -290,7 +290,7 @@ cvCamShift( const void* imgProb, CvRect windowIn,
}
cv::RotatedRect cv::CamShift( const InputArray& _probImage, Rect& window,
cv::RotatedRect cv::CamShift( InputArray _probImage, Rect& window,
TermCriteria criteria )
{
CvConnectedComp comp;
@@ -302,7 +302,7 @@ cv::RotatedRect cv::CamShift( const InputArray& _probImage, Rect& window,
return RotatedRect(Point2f(box.center), Size2f(box.size), box.angle);
}
int cv::meanShift( const InputArray& _probImage, Rect& window, TermCriteria criteria )
int cv::meanShift( InputArray _probImage, Rect& window, TermCriteria criteria )
{
CvConnectedComp comp;
Mat probImage = _probImage.getMat();

8
modules/video/src/lkpyramid.cpp
View File

@@ -42,8 +42,8 @@
#include <float.h>
#include <stdio.h>
void cv::calcOpticalFlowPyrLK( const InputArray& _prevImg, const InputArray& _nextImg,
const InputArray& _prevPts, InputOutputArray _nextPts,
void cv::calcOpticalFlowPyrLK( InputArray _prevImg, InputArray _nextImg,
InputArray _prevPts, InputOutputArray _nextPts,
OutputArray _status, OutputArray _err,
Size winSize, int maxLevel,
TermCriteria criteria,
@@ -1869,8 +1869,8 @@ cvEstimateRigidTransform( const CvArr* matA, const CvArr* matB, CvMat* matM, int
return 1;
}
cv::Mat cv::estimateRigidTransform( const InputArray& src1,
const InputArray& src2,
cv::Mat cv::estimateRigidTransform( InputArray src1,
InputArray src2,
bool fullAffine )
{
Mat M(2, 3, CV_64F), A = src1.getMat(), B = src2.getMat();

10
modules/video/src/motempl.cpp
View File

@@ -442,7 +442,7 @@ cvSegmentMotion( const CvArr* mhiimg, CvArr* segmask, CvMemStorage* storage,
}
void cv::updateMotionHistory( const InputArray& _silhouette, InputOutputArray _mhi,
void cv::updateMotionHistory( InputArray _silhouette, InputOutputArray _mhi,
double timestamp, double duration )
{
Mat silhouette = _silhouette.getMat();
@@ -450,7 +450,7 @@ void cv::updateMotionHistory( const InputArray& _silhouette, InputOutputArray _m
cvUpdateMotionHistory( &c_silhouette, &c_mhi, timestamp, duration );
}
void cv::calcMotionGradient( const InputArray& _mhi, OutputArray _mask,
void cv::calcMotionGradient( InputArray _mhi, OutputArray _mask,
OutputArray _orientation,
double delta1, double delta2,
int aperture_size )
@@ -462,8 +462,8 @@ void cv::calcMotionGradient( const InputArray& _mhi, OutputArray _mask,
cvCalcMotionGradient(&c_mhi, &c_mask, &c_orientation, delta1, delta2, aperture_size);
}
double cv::calcGlobalOrientation( const InputArray& _orientation, const InputArray& _mask,
const InputArray& _mhi, double timestamp,
double cv::calcGlobalOrientation( InputArray _orientation, InputArray _mask,
InputArray _mhi, double timestamp,
double duration )
{
Mat orientation = _orientation.getMat(), mask = _mask.getMat(), mhi = _mhi.getMat();
@@ -471,7 +471,7 @@ double cv::calcGlobalOrientation( const InputArray& _orientation, const InputArr
return cvCalcGlobalOrientation(&c_orientation, &c_mask, &c_mhi, timestamp, duration);
}
void cv::segmentMotion(const InputArray& _mhi, OutputArray _segmask,
void cv::segmentMotion(InputArray _mhi, OutputArray _segmask,
vector<Rect>& boundingRects,
double timestamp, double segThresh)
{

2
modules/video/src/optflowgf.cpp
View File

@@ -563,7 +563,7 @@ FarnebackUpdateFlow_GaussianBlur( const Mat& _R0, const Mat& _R1,
}
void cv::calcOpticalFlowFarneback( const InputArray& _prev0, const InputArray& _next0,
void cv::calcOpticalFlowFarneback( InputArray _prev0, InputArray _next0,
OutputArray _flow0, double pyr_scale, int levels, int winsize,
int iterations, int poly_n, double poly_sigma, int flags )
{