potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Drop cv:: prefix from cv::String used inside the cv namespace

Browse Source
This commit is contained in:
Andrey Kamaev
2013-03-22 20:37:49 +04:00
parent 75513a46dc
commit be7bbe3aa9
122 changed files with 1077 additions and 1077 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/videostab/include/opencv2/videostab/frame_source.hpp
+1 -1
View File
@@ -69,7 +69,7 @@ public:
class CV_EXPORTS VideoFileSource : public IFrameSource
{
public:
VideoFileSource(const cv::String &path, bool volatileFrame = false);
VideoFileSource(const String &path, bool volatileFrame = false);
virtual void reset();
virtual Mat nextFrame();
modules/videostab/include/opencv2/videostab/global_motion.hpp
+2 -2
View File
@@ -145,7 +145,7 @@ private:
class CV_EXPORTS FromFileMotionReader : public ImageMotionEstimatorBase
{
public:
FromFileMotionReader(const cv::String &path);
FromFileMotionReader(const String &path);
virtual Mat estimate(const Mat &frame0, const Mat &frame1, bool *ok = 0);
@@ -156,7 +156,7 @@ private:
class CV_EXPORTS ToFileMotionWriter : public ImageMotionEstimatorBase
{
public:
ToFileMotionWriter(const cv::String &path, Ptr<ImageMotionEstimatorBase> estimator);
ToFileMotionWriter(const String &path, Ptr<ImageMotionEstimatorBase> estimator);
virtual void setMotionModel(MotionModel val) { motionEstimator_->setMotionModel(val); }
virtual MotionModel motionModel() const { return motionEstimator_->motionModel(); }
modules/videostab/src/frame_source.cpp
+3 -3
View File
@@ -59,7 +59,7 @@ namespace {
class VideoFileSourceImpl : public IFrameSource
{
public:
VideoFileSourceImpl(const cv::String &path, bool volatileFrame)
VideoFileSourceImpl(const String &path, bool volatileFrame)
: path_(path), volatileFrame_(volatileFrame) { reset(); }
virtual void reset()
@@ -96,7 +96,7 @@ public:
#endif
private:
cv::String path_;
String path_;
bool volatileFrame_;
#ifdef HAVE_OPENCV_HIGHGUI
VideoCapture vc;
@@ -105,7 +105,7 @@ private:
}//namespace
VideoFileSource::VideoFileSource(const cv::String &path, bool volatileFrame)
VideoFileSource::VideoFileSource(const String &path, bool volatileFrame)
: impl(new VideoFileSourceImpl(path, volatileFrame)) {}
void VideoFileSource::reset() { impl->reset(); }
modules/videostab/src/global_motion.cpp
+2 -2
View File
@@ -621,7 +621,7 @@ Mat MotionEstimatorL1::estimate(InputArray points0, InputArray points1, bool *ok
}
FromFileMotionReader::FromFileMotionReader(const cv::String &path)
FromFileMotionReader::FromFileMotionReader(const String &path)
: ImageMotionEstimatorBase(MM_UNKNOWN)
{
file_.open(path.c_str());
@@ -641,7 +641,7 @@ Mat FromFileMotionReader::estimate(const Mat &/*frame0*/, const Mat &/*frame1*/,
}
ToFileMotionWriter::ToFileMotionWriter(const cv::String &path, Ptr<ImageMotionEstimatorBase> estimator)
ToFileMotionWriter::ToFileMotionWriter(const String &path, Ptr<ImageMotionEstimatorBase> estimator)
: ImageMotionEstimatorBase(estimator->motionModel()), motionEstimator_(estimator)
{
file_.open(path.c_str());