From 81b389331d3bcee338940f3b4114ec7e7a13d29c Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Tue, 17 Mar 2015 16:27:40 +0000 Subject: [PATCH 1/2] Fix PlaYUVerFrame conversion to cv::mat --- lib/PlaYUVerFrame.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/PlaYUVerFrame.cpp b/lib/PlaYUVerFrame.cpp index bacb270..386875e 100644 --- a/lib/PlaYUVerFrame.cpp +++ b/lib/PlaYUVerFrame.cpp @@ -438,7 +438,7 @@ Void PlaYUVerFrame::getCvMat( Void** ppCvFrame ) switch( m_pcPelFormat->numberChannels ) { case 3: - cvType = CV_8UC3; + cvType = CV_8UC4; break; case 1: cvType = CV_8UC1; From 02d11520494b0c791348f88672eb57b70dbd1bb1 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Tue, 17 Mar 2015 16:32:10 +0000 Subject: [PATCH 2/2] Incremente version to 0.6 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e8c1381..e0ae189 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,8 +12,8 @@ SET( PROJECT_NAME "playuver" ) PROJECT( ${PROJECT_NAME} ) SET( PLAYUVER_VERSION_MAJOR "0" ) -SET( PLAYUVER_VERSION_MINOR "5" ) -SET( PLAYUVER_VERSION_PATCH "1" ) +SET( PLAYUVER_VERSION_MINOR "6" ) +SET( PLAYUVER_VERSION_PATCH "0" ) SET( PLAYUVER_VERSION "${PLAYUVER_VERSION_MAJOR}.${PLAYUVER_VERSION_MINOR}.${PLAYUVER_VERSION_PATCH}")