Merge branch 'master' into devel

This commit is contained in:
jfmcarreira committed 2015-03-04 20:11:14 +00:00
commit d1ad36c28a
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -112,7 +112,7 @@ Bool LibOpenCVHandler::loadFrame( PlaYUVerFrame* pcFrame, std::string filename )
return true;
}
Bool LibOpenCVHandler::saveFrame( const PlaYUVerFrame* pcFrame, std::string filename )
Bool LibOpenCVHandler::saveFrame( PlaYUVerFrame* pcFrame, std::string filename )
{
Int cvType = CV_8UC3;
+1 -1
View File
@@ -52,7 +52,7 @@ public:
}
static Bool loadFrame( PlaYUVerFrame* pcFrame, std::string filename );
static Bool saveFrame( const PlaYUVerFrame* pcFrame, std::string filename );
static Bool saveFrame( PlaYUVerFrame* pcFrame, std::string filename );
private:
std::string m_cFilename;