mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-12 10:58:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed max pix threshold check bug and check_method SQL error.

Browse Source 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@859 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan
2004-02-15 23:16:35 +00:00
parent 9ead79db37
commit 2fe2c2a5ee
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/zm_zone.cpp
View File

@@ -102,12 +102,13 @@ bool Zone::CheckAlarms( const Image *delta_image )
int hi_x = limits.Hi().X();
int hi_y = limits.Hi().Y();
unsigned char *pdiff;
for ( int y = lo_y; y <= hi_y; y++ )
{
unsigned char *pdiff = diff_image->Buffer( lo_x, y );
pdiff = diff_image->Buffer( lo_x, y );
for ( int x = lo_x; x <= hi_x; x++, pdiff++ )
{
if ( (*pdiff > min_pixel_threshold) && (max_pixel_threshold && (*pdiff < max_pixel_threshold)) )
if ( (*pdiff > min_pixel_threshold) && (!max_pixel_threshold || (*pdiff < max_pixel_threshold)) )
{
*pdiff = WHITE;
alarm_pixels++;
@@ -448,7 +449,7 @@ bool Zone::CheckAlarms( const Image *delta_image )
int Zone::Load( Monitor *monitor, Zone **&zones )
{
static char sql[BUFSIZ];
sprintf( sql, "select Id,Name,Type+0,Units,LoX,LoY,HiX,HiY,AlarmRGB,CheckMethod,MinPixelThreshold,MaxPixelThreshold,MinAlarmPixels,MaxAlarmPixels,FilterX,FilterY,MinFilterPixels,MaxFilterPixels,MinBlobPixels,MaxBlobPixels,MinBlobs,MaxBlobs from Zones where MonitorId = %d order by Type, Id", monitor->Id() );
sprintf( sql, "select Id,Name,Type+0,Units,LoX,LoY,HiX,HiY,AlarmRGB,CheckMethod+0,MinPixelThreshold,MaxPixelThreshold,MinAlarmPixels,MaxAlarmPixels,FilterX,FilterY,MinFilterPixels,MaxFilterPixels,MinBlobPixels,MaxBlobPixels,MinBlobs,MaxBlobs from Zones where MonitorId = %d order by Type, Id", monitor->Id() );
if ( mysql_query( &dbconn, sql ) )
{
Error(( "Can't run query: %s", mysql_error( &dbconn ) ));