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

Merge branch 'master' of github.com:ZoneMinder/zoneminder

This commit is contained in:
Isaac Connor 2021-05-03 13:18:51 -04:00
parent 8bd876d8c8 90dff85e40
commit bc6ba0a772
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/zm_image.cpp
View File

@ -174,7 +174,7 @@ Image::Image(int p_width, int p_height, int p_colours, int p_subpixelorder, uint
} else { } else {
AllocImgBuffer(size); AllocImgBuffer(size);
} }
if (!subpixelorder) { if (!subpixelorder and colours>1) {
// Default to RGBA when no subpixelorder is specified. // Default to RGBA when no subpixelorder is specified.
subpixelorder = ZM_SUBPIX_ORDER_RGBA; subpixelorder = ZM_SUBPIX_ORDER_RGBA;
} }
@ -205,7 +205,7 @@ Image::Image(int p_width, int p_linesize, int p_height, int p_colours, int p_sub
} else { } else {
AllocImgBuffer(size); AllocImgBuffer(size);
} }
if (!subpixelorder) { if (!subpixelorder and colours>1) {
// Default to RGBA when no subpixelorder is specified. // Default to RGBA when no subpixelorder is specified.
subpixelorder = ZM_SUBPIX_ORDER_RGBA; subpixelorder = ZM_SUBPIX_ORDER_RGBA;
} }

4
src/zmc.cpp
View File

@ -252,6 +252,7 @@ int main(int argc, char *argv[]) {
monitor->Id()); monitor->Id());
zmDbDo(sql); zmDbDo(sql);
int sleep_time = 0;
while (monitor->PrimeCapture() <= 0) { while (monitor->PrimeCapture() <= 0) {
if (prime_capture_log_count % 60) { if (prime_capture_log_count % 60) {
logPrintf(Logger::ERROR+monitor->Importance(), logPrintf(Logger::ERROR+monitor->Importance(),
@ -261,7 +262,8 @@ int main(int argc, char *argv[]) {
} }
prime_capture_log_count ++; prime_capture_log_count ++;
if (zm_terminate) break; if (zm_terminate) break;
sleep(1); if (sleep_time < 60) sleep_time++;
sleep(sleep_time);
} }
if (zm_terminate) break; if (zm_terminate) break;