ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

blah

pull/2077/head
Isaac Connor 2017-08-11 12:20:46 -04:00
parent daee5b4450
commit 83f8a240d5
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/zm_monitor.cpp
View File

@ -560,7 +560,7 @@ bool Monitor::connect() {
Debug(3,"Aligning shared memory images to the next 64 byte boundary"); Debug(3,"Aligning shared memory images to the next 64 byte boundary");
shared_images = (uint8_t*)((unsigned long)shared_images + (64 - ((unsigned long)shared_images % 64))); shared_images = (uint8_t*)((unsigned long)shared_images + (64 - ((unsigned long)shared_images % 64)));
} }
if ( purpose == CAPTURE ) { if ( purpose != ANALYSIS ) {
Debug(3, "Allocating %d image buffers", image_buffer_count ); Debug(3, "Allocating %d image buffers", image_buffer_count );
image_buffer = new Snapshot[image_buffer_count]; image_buffer = new Snapshot[image_buffer_count];
for ( int i = 0; i < image_buffer_count; i++ ) { for ( int i = 0; i < image_buffer_count; i++ ) {

5
src/zm_monitorstream.cpp
View File

@ -484,7 +484,10 @@ void MonitorStream::runStream() {
openComms(); openComms();
checkInitialised(); if ( ! checkInitialised() ) {
Error("Not initialized");
return;
}
updateFrameRate( monitor->GetFPS() ); updateFrameRate( monitor->GetFPS() );