r/moodmeter
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix a bug where the screen hangs in the case of photo/video

Browse source
This commit is contained in:
abdelrahman 2016-04-05 13:58:40 -04:00
parent 549e446f21
commit 9af6fcd9c2
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -77,7 +77,7 @@ endif( DEFINED OpenCV_DIR )
set(Boost_USE_MULTITHREADED ON) set(Boost_USE_MULTITHREADED ON)
set( BOOST_COMPONENTS system filesystem date_time regex thread timer chrono serialization log log_setup program_options) set( BOOST_COMPONENTS system filesystem date_time regex thread timer chrono serialization log log_setup program_options)
set( BOOST_MIN_VERSION "1.55.0" CACHE STRING "Minimum version of boost you would like to link against (e.g. C:/BOOST_1_55_0 is 1.55.0" ) set( BOOST_MIN_VERSION "1.54.0" CACHE STRING "Minimum version of boost you would like to link against (e.g. C:/BOOST_1_55_0 is 1.55.0" )
status("") status("")
if( ANDROID ) if( ANDROID )
find_host_package( Boost ${BOOST_MIN_VERSION} REQUIRED COMPONENTS ${BOOST_COMPONENTS} ) find_host_package( Boost ${BOOST_MIN_VERSION} REQUIRED COMPONENTS ${BOOST_COMPONENTS} )
@ -159,4 +159,4 @@ status("")
status( "Apps identified for building:" ) status( "Apps identified for building:" )
foreach( app ${${rootProject}_APPS} ) foreach( app ${${rootProject}_APPS} )
status( " - ${app}" ) status( " - ${app}" )
endforeach( app ${${rootProject}_APPS} ) endforeach( app ${${rootProject}_APPS} )

2
video-demo/video-demo.cpp
View file

@ -168,7 +168,7 @@ int main(int argsc, char ** argsv)
((PhotoDetector *)detector.get())->process(frame); //Process an image ((PhotoDetector *)detector.get())->process(frame); //Process an image
} }
while (!VIDEO_EXTS[fileExt] || videoListenPtr->isRunning()) while (VIDEO_EXTS[fileExt] && videoListenPtr->isRunning())
{ {
if (listenPtr->getDataSize() > 0) if (listenPtr->getDataSize() > 0)
{ {