fix merge
This commit is contained in:
parent
7e3b101d7f
commit
781d49dfb1
|
@ -77,6 +77,7 @@ protected:
|
|||
|
||||
// Outputs/Statistics
|
||||
bool alarmed;
|
||||
bool was_alarmed;
|
||||
int pixel_diff;
|
||||
unsigned int alarm_pixels;
|
||||
int alarm_filter_pixels;
|
||||
|
|
Loading…
Reference in New Issue