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

quiet coverity

This commit is contained in:
Isaac Connor 2017-12-12 12:37:49 -05:00
parent 8c1159ad56
commit f8738f2387
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/zm_monitor.cpp
View File

@ -437,8 +437,7 @@ Monitor::Monitor(
video_store_data->size = sizeof(VideoStoreData); video_store_data->size = sizeof(VideoStoreData);
//video_store_data->frameNumber = 0; //video_store_data->frameNumber = 0;
} else if ( purpose == ANALYSIS ) { } else if ( purpose == ANALYSIS ) {
this->connect(); if ( ! ( this->connect() && mem_ptr ) ) exit(-1);
if ( ! mem_ptr ) exit(-1);
shared_data->state = IDLE; shared_data->state = IDLE;
shared_data->last_read_time = 0; shared_data->last_read_time = 0;
shared_data->alarm_x = -1; shared_data->alarm_x = -1;
@ -472,6 +471,9 @@ Monitor::Monitor(
//Set video recording flag for event start constructor and easy reference in code //Set video recording flag for event start constructor and easy reference in code
videoRecording = ((GetOptVideoWriter() == H264PASSTHROUGH) && camera->SupportsNativeVideo()); videoRecording = ((GetOptVideoWriter() == H264PASSTHROUGH) && camera->SupportsNativeVideo());
n_linked_monitors = 0;
linked_monitors = 0;
if ( purpose == ANALYSIS ) { if ( purpose == ANALYSIS ) {
Debug(2,"last_write_index(%d), last_write_time(%d)", shared_data->last_write_index, shared_data->last_write_time ); Debug(2,"last_write_index(%d), last_write_time(%d)", shared_data->last_write_index, shared_data->last_write_time );
while( while(
@ -483,10 +485,6 @@ Debug(2,"last_write_index(%d), last_write_time(%d)", shared_data->last_write_ind
sleep( 1 ); sleep( 1 );
} }
ref_image.Assign( width, height, camera->Colours(), camera->SubpixelOrder(), image_buffer[shared_data->last_write_index].image->Buffer(), camera->ImageSize()); ref_image.Assign( width, height, camera->Colours(), camera->SubpixelOrder(), image_buffer[shared_data->last_write_index].image->Buffer(), camera->ImageSize());
n_linked_monitors = 0;
linked_monitors = 0;
adaptive_skip = true; adaptive_skip = true;
ReloadLinkedMonitors( p_linked_monitors ); ReloadLinkedMonitors( p_linked_monitors );