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

Merge branch 'linux-3.0' of https://github.com/Affectiva/win-sdk-samples into linux-3.0

Browse source
This commit is contained in:
Abdelrahman Mahmoud 2016-04-08 10:13:45 -04:00
commit 23fff5902b
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
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} )

4
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()) do
{ {
if (listenPtr->getDataSize() > 0) if (listenPtr->getDataSize() > 0)
{ {
@ -189,7 +189,7 @@ int main(int argsc, char ** argsv)
listenPtr->outputToFile(faces, frame.getTimestamp()); listenPtr->outputToFile(faces, frame.getTimestamp());
} }
} } while(VIDEO_EXTS[fileExt] && videoListenPtr->isRunning());
} while(loop); } while(loop);
detector->stop(); detector->stop();