ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Merge of score unsigned int

This commit is contained in:
SteveGilvarry 2015-11-09 00:09:49 +11:00
parent a700cbffdb
commit f853059ff4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/zm_monitor.cpp
View File

@ -1523,7 +1523,7 @@ bool Monitor::Analyse()
#endif // ZM_PLUGINS_ON #endif // ZM_PLUGINS_ON
{ {
Event::StringSet zoneSet; Event::StringSet zoneSet;
int motion_score = last_motion_score; unsigned int motion_score = last_motion_score;
bool alarm = false; bool alarm = false;
if ( !(image_count % (motion_frame_skip+1) ) ) if ( !(image_count % (motion_frame_skip+1) ) )
{ {
@ -3578,7 +3578,7 @@ unsigned int Monitor::DetectBlack(const Image &comp_image, Event::StringSet &zon
unsigned int Monitor::DetectMotion( const Image &comp_image, Event::StringSet &zoneSet, unsigned int &score ) unsigned int Monitor::DetectMotion( const Image &comp_image, Event::StringSet &zoneSet, unsigned int &score )
{ {
bool alarm = false; bool alarm = false;
unsigned int score = 0; score = 0;
if ( n_zones <= 0 ) return( alarm ); if ( n_zones <= 0 ) return( alarm );

2
src/zm_monitor.h
View File

@ -419,7 +419,7 @@ public:
return( camera->PostCapture() ); return( camera->PostCapture() );
} }
unsigned int DetectMotion( const Image &comp_image, Event::StringSet &zoneSet ); unsigned int DetectMotion( const Image &comp_image, Event::StringSet &zoneSet, unsigned int &score );
// DetectBlack seems to be unused. Check it on zm_monitor.cpp for more info. // DetectBlack seems to be unused. Check it on zm_monitor.cpp for more info.
//unsigned int DetectBlack( const Image &comp_image, Event::StringSet &zoneSet ); //unsigned int DetectBlack( const Image &comp_image, Event::StringSet &zoneSet );
bool CheckSignal( const Image *image ); bool CheckSignal( const Image *image );