potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 07:13:02 +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/superres/src/frame_source.cpp
+8 -8
View File
@@ -129,15 +129,15 @@ namespace
class VideoFrameSource : public CaptureFrameSource
{
public:
VideoFrameSource(const std::string& fileName);
VideoFrameSource(const cv::String& fileName);
void reset();
private:
std::string fileName_;
cv::String fileName_;
};
VideoFrameSource::VideoFrameSource(const std::string& fileName) : fileName_(fileName)
VideoFrameSource::VideoFrameSource(const cv::String& fileName) : fileName_(fileName)
{
reset();
}
@@ -173,7 +173,7 @@ namespace
}
}
Ptr<FrameSource> cv::superres::createFrameSource_Video(const std::string& fileName)
Ptr<FrameSource> cv::superres::createFrameSource_Video(const cv::String& fileName)
{
return new VideoFrameSource(fileName);
}
@@ -204,18 +204,18 @@ namespace
class VideoFrameSource_GPU : public FrameSource
{
public:
VideoFrameSource_GPU(const std::string& fileName);
VideoFrameSource_GPU(const cv::String& fileName);
void nextFrame(OutputArray frame);
void reset();
private:
std::string fileName_;
cv::String fileName_;
VideoReader_GPU reader_;
GpuMat frame_;
};
VideoFrameSource_GPU::VideoFrameSource_GPU(const std::string& fileName) : fileName_(fileName)
VideoFrameSource_GPU::VideoFrameSource_GPU(const cv::String& fileName) : fileName_(fileName)
{
reset();
}
@@ -246,7 +246,7 @@ namespace
}
}
Ptr<FrameSource> cv::superres::createFrameSource_Video_GPU(const std::string& fileName)
Ptr<FrameSource> cv::superres::createFrameSource_Video_GPU(const cv::String& fileName)
{
return new VideoFrameSource(fileName);
}