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

Merge branch 'master' into zma_to_thread

Browse Source
This commit is contained in:
Isaac Connor committed 2020-07-21 17:38:32 -04:00
2 parents 4ff341a0f5 2fb89b6241
commit 7575afc8d5
210 files changed
+3521 -4636
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/zm_zone.cpp
+8 -6
View File
@@ -53,7 +53,7 @@ void Zone::Setup(
id = p_id;
label = new char[strlen(p_label)+1];
strcpy( label, p_label );
strcpy(label, p_label);
type = p_type;
polygon = p_polygon;
alarm_rgb = p_alarm_rgb;
@@ -89,10 +89,10 @@ void Zone::Setup(
overload_count = 0;
extend_alarm_count = 0;
pg_image = new Image( monitor->Width(), monitor->Height(), 1, ZM_SUBPIX_ORDER_NONE );
pg_image = new Image(monitor->Width(), monitor->Height(), 1, ZM_SUBPIX_ORDER_NONE);
pg_image->Clear();
pg_image->Fill( 0xff, polygon );
pg_image->Outline( 0xff, polygon );
pg_image->Fill(0xff, polygon);
pg_image->Outline(0xff, polygon);
ranges = new Range[monitor->Height()];
for ( unsigned int y = 0; y < monitor->Height(); y++ ) {
@@ -113,8 +113,10 @@ void Zone::Setup(
}
if ( config.record_diag_images ) {
snprintf(diag_path, sizeof(diag_path), config.record_diag_images_fifo ? "%s/diagpipe-%d-poly.jpg" : "%s/diag-%d-poly.jpg", monitor->getStorage()->Path(), id);
if (config.record_diag_images_fifo)
snprintf(diag_path, sizeof(diag_path),
config.record_diag_images_fifo ? "%s/diagpipe-%d-poly.jpg" : "%s/diag-%d-poly.jpg",
monitor->getStorage()->Path(), id);
if ( config.record_diag_images_fifo )
FifoStream::fifo_create_if_missing(diag_path);
pg_image->WriteJpeg(diag_path, config.record_diag_images_fifo);
} else {