jfmcarreira/calyp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reduce the use of C-pointers in CalypFrame and CalypStream

Browse Source
This commit is contained in:
jfmcarreira
2021-07-10 16:28:10 +01:00
parent be82c6ca89
commit 8ef5b31268
25 changed files with 174 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/StreamHandlerOpenCV.cpp
+6 -6
View File
@@ -126,7 +126,7 @@ void StreamHandlerOpenCV::closeHandler()
}
}
bool StreamHandlerOpenCV::configureBuffer( CalypFrame* pcFrame )
bool StreamHandlerOpenCV::configureBuffer( const CalypFrame& pcFrame )
{
return true;
}
@@ -137,7 +137,7 @@ bool StreamHandlerOpenCV::seek( ClpULong iFrameNum )
return true;
}
bool StreamHandlerOpenCV::read( CalypFrame* pcFrame )
bool StreamHandlerOpenCV::read( CalypFrame& pcFrame )
{
bool bRet = false;
if( pcVideoCapture )
@@ -145,23 +145,23 @@ bool StreamHandlerOpenCV::read( CalypFrame* pcFrame )
Mat cvMat;
bRet = pcVideoCapture->read( cvMat );
if( bRet )
bRet = pcFrame->fromMat( cvMat );
bRet = pcFrame.fromMat( cvMat );
}
else
{
Mat cvMat = cv::imread( m_cFilename );
bRet = pcFrame->fromMat( cvMat );
bRet = pcFrame.fromMat( cvMat );
}
if( bRet )
m_uiCurrFrameFileIdx++;
return bRet;
}
bool StreamHandlerOpenCV::write( CalypFrame* pcFrame )
bool StreamHandlerOpenCV::write( const CalypFrame& pcFrame )
{
bool bRet = false;
Mat cvFrame;
bRet = pcFrame->toMat( cvFrame, false, true );
bRet = pcFrame.toMat( cvFrame, false, true );
if( !bRet )
return bRet;
bRet = cv::imwrite( m_cFilename, cvFrame );