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

All modules (except ocl and gpu) compiles and pass tests

Browse Source
This commit is contained in:
Andrey Kamaev
2013-03-20 20:13:46 +04:00
parent 762aefd71b
commit 2ad7b97f1c
91 changed files with 606 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/videostab/src/frame_source.cpp
+4 -4
View File
@@ -59,7 +59,7 @@ namespace {
class VideoFileSourceImpl : public IFrameSource
{
public:
VideoFileSourceImpl(const std::string &path, bool volatileFrame)
VideoFileSourceImpl(const cv::String &path, bool volatileFrame)
: path_(path), volatileFrame_(volatileFrame) { reset(); }
virtual void reset()
@@ -68,7 +68,7 @@ public:
vc.release();
vc.open(path_);
if (!vc.isOpened())
throw std::runtime_error("can't open file: " + path_);
CV_Error(0, "can't open file: " + path_);
#else
CV_Error(CV_StsNotImplemented, "OpenCV has been compiled without video I/O support");
#endif
@@ -96,7 +96,7 @@ public:
#endif
private:
std::string path_;
cv::String path_;
bool volatileFrame_;
#ifdef HAVE_OPENCV_HIGHGUI
VideoCapture vc;
@@ -105,7 +105,7 @@ private:
}//namespace
VideoFileSource::VideoFileSource(const std::string &path, bool volatileFrame)
VideoFileSource::VideoFileSource(const cv::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 std::string &path)
FromFileMotionReader::FromFileMotionReader(const cv::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 std::string &path, Ptr<ImageMotionEstimatorBase> estimator)
ToFileMotionWriter::ToFileMotionWriter(const cv::String &path, Ptr<ImageMotionEstimatorBase> estimator)
: ImageMotionEstimatorBase(estimator->motionModel()), motionEstimator_(estimator)
{
file_.open(path.c_str());