From 527dd0dc72c1da271f5720b60231e7c36964149c Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Thu, 26 Mar 2015 18:28:46 +0000 Subject: [PATCH 1/2] Make read/write formats with opencv handler the same --- lib/LibOpenCVHandler.cpp | 14 ++------------ lib/PlaYUVerStream.cpp | 10 ++-------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/lib/LibOpenCVHandler.cpp b/lib/LibOpenCVHandler.cpp index ea191b8..a4ca1d8 100644 --- a/lib/LibOpenCVHandler.cpp +++ b/lib/LibOpenCVHandler.cpp @@ -66,22 +66,12 @@ std::vector LibOpenCVHandler::supportedWriteFormatsName() std::vector LibOpenCVHandler::supportedSaveFormatsExt() { - std::vector formatsExt; - formatsExt.push_back( "bmp" ); - formatsExt.push_back( "bmp" ); - formatsExt.push_back( "jpg" ); - formatsExt.push_back( "png" ); - return formatsExt; + return supportedReadFormatsExt(); } std::vector LibOpenCVHandler::supportedSaveFormatsName() { - std::vector 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 ) diff --git a/lib/PlaYUVerStream.cpp b/lib/PlaYUVerStream.cpp index 901e598..4b5b85f 100644 --- a/lib/PlaYUVerStream.cpp +++ b/lib/PlaYUVerStream.cpp @@ -84,28 +84,22 @@ std::vector PlaYUVerStream::supportedWriteFormatsName() std::vector PlaYUVerStream::supportedSaveFormatsExt() { - std::vector formatsExt; - std::vector writeExt = supportedWriteFormatsExt(); - formatsExt.insert( formatsExt.begin(), writeExt.begin(), writeExt.end() ); + std::vector formatsExt = supportedWriteFormatsExt(); #ifdef USE_OPENCV std::vector 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 PlaYUVerStream::supportedSaveFormatsName() { - std::vector formatsName; - std::vector writeName = supportedWriteFormatsName(); - formatsName.insert( formatsName.begin(), writeName.begin(), writeName.end() ); + std::vector formatsName = supportedWriteFormatsName(); #ifdef USE_OPENCV std::vector 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; } From 2cdda80e4999b4f1ff8eec54d4065afcadfd5c76 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Thu, 26 Mar 2015 18:29:21 +0000 Subject: [PATCH 2/2] Deploy version 0.6.3 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c8f107c..d82dffc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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}")