Merge branch 'master' into devel

This commit is contained in:
jfmcarreira committed 2015-03-26 18:30:03 +00:00
commit 8160ff50e9
3 files changed
+5 -21

No files matched your search

+1 -1
View File
@@ -13,7 +13,7 @@ SET( PROJECT_NAME "playuver" )
PROJECT( ${PROJECT_NAME} )
SET( PLAYUVER_VERSION_MAJOR "0" )
SET( PLAYUVER_VERSION_MINOR "6" )
SET( PLAYUVER_VERSION_PATCH "2" )
SET( PLAYUVER_VERSION_PATCH "3" )
SET( PLAYUVER_VERSION "${PLAYUVER_VERSION_MAJOR}.${PLAYUVER_VERSION_MINOR}.${PLAYUVER_VERSION_PATCH}")
+2 -12
View File
@@ -66,22 +66,12 @@ std::vector<std::string> LibOpenCVHandler::supportedWriteFormatsName()
std::vector<std::string> LibOpenCVHandler::supportedSaveFormatsExt()
{
std::vector<std::string> formatsExt;
formatsExt.push_back( "bmp" );
formatsExt.push_back( "bmp" );
formatsExt.push_back( "jpg" );
formatsExt.push_back( "png" );
return formatsExt;
return supportedReadFormatsExt();
}
std::vector<std::string> LibOpenCVHandler::supportedSaveFormatsName()
{
std::vector<std::string> formatsName;
formatsName.push_back( "Windows Bitmap" );
formatsName.push_back( "Windows Bitmap" );
formatsName.push_back( "Joint Photographic Experts Group" );
formatsName.push_back( "Portable Network Graphics" );
return formatsName;
return supportedReadFormatsName();
}
PlaYUVerFrame* LibOpenCVHandler::loadFrame( std::string filename )
+2 -8
View File
@@ -84,28 +84,22 @@ std::vector<std::string> PlaYUVerStream::supportedWriteFormatsName()
std::vector<std::string> PlaYUVerStream::supportedSaveFormatsExt()
{
std::vector<std::string> formatsExt;
std::vector<std::string> writeExt = supportedWriteFormatsExt();
formatsExt.insert( formatsExt.begin(), writeExt.begin(), writeExt.end() );
std::vector<std::string> formatsExt = supportedWriteFormatsExt();
#ifdef USE_OPENCV
std::vector<std::string> opencvFmt = LibOpenCVHandler::supportedSaveFormatsExt();
formatsExt.insert( formatsExt.end(), opencvFmt.begin(), opencvFmt.end() );
#endif
sort( formatsExt.begin(), formatsExt.end() );
formatsExt.erase( unique( formatsExt.begin(), formatsExt.end() ), formatsExt.end() );
return formatsExt;
}
std::vector<std::string> PlaYUVerStream::supportedSaveFormatsName()
{
std::vector<std::string> formatsName;
std::vector<std::string> writeName = supportedWriteFormatsName();
formatsName.insert( formatsName.begin(), writeName.begin(), writeName.end() );
std::vector<std::string> formatsName = supportedWriteFormatsName();
#ifdef USE_OPENCV
std::vector<std::string> opencvFmt = LibOpenCVHandler::supportedSaveFormatsName();
formatsName.insert( formatsName.end(), opencvFmt.begin(), opencvFmt.end() );
#endif
sort( formatsName.begin(), formatsName.end() );
formatsName.erase( unique( formatsName.begin(), formatsName.end() ), formatsName.end() );
return formatsName;
}