934c726beb
Handle camera not being defined in SubpixelOrder and Colours. Remove subpixelorder as it exists in camera only
2021-05-03 15:19:45 -04:00
d92c95a420
if analysis frame doesn't exist revert back to capt
2021-05-03 15:18:35 -04:00
80d2f9f098
Revert "Don't consult a Camera object to return colours and subpixelorder, we have those as members. Fixes crash in zms"
...
This reverts commit 48f79da892
2021-05-03 14:19:34 -04:00
bc6ba0a772
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2021-05-03 13:18:51 -04:00
8bd876d8c8
improve warning message to include the values that don't match
2021-05-03 13:18:39 -04:00
90dff85e40
Only default to BGRA when colours are > 1.
2021-05-03 13:17:58 -04:00
bf72bb2a22
Increase sleep after prime failure up to a minute.
2021-05-03 10:38:01 -04:00
e5ceed31cc
Image: Fix a typo introduced in 3f5dbb7780
2021-05-02 23:22:49 +02:00
e5613d0d27
Make sure all logging macro calls are terminated with a semicolon
2021-05-02 23:08:48 +02:00
260fcaadde
remove debug
2021-05-02 14:07:29 -04:00
3f5dbb7780
Default to rgba when subpixelorder is not specified
2021-05-02 14:07:29 -04:00
44e8107cac
Fix AlarmedZoneId filter term not working because I wrote AlarmZoneId instead
2021-05-02 13:38:06 -04:00
91a09608ea
Use newlines to make debugging sql easier to read.
2021-05-02 13:37:26 -04:00
b70cd053d6
spacing and quotes
2021-05-02 12:43:17 -04:00
88147f3f7a
add another logInit so that early messages go to zms.log after loading config. Add Image::Initialise so that initialised flag will get set, and add a Deinitialise call so that ram allocated in zm_image gets freed.
2021-05-01 14:49:33 -04:00
59b1927ad6
do dbQUeue.stop in logTerm so we don't have to have an extra line in every executable
2021-05-01 14:49:33 -04:00
48f79da892
Don't consult a Camera object to return colours and subpixelorder, we have those as members. Fixes crash in zms
2021-05-01 14:49:33 -04:00
ad388e9fc5
Free up encodejpg_ccinfo in Deinitialize
2021-05-01 14:49:33 -04:00
9f60b021ef
Merge pull request #3227 from Carbenium/werror
...
Enable Werror for CI builds
2021-04-30 19:34:03 -04:00
3bbec92d40
utils/packpack: Update RtspServer
2021-05-01 00:39:22 +02:00
14cb2bc3dd
zm_rtsp_server: Remove an unused variable
2021-05-01 00:24:54 +02:00
6c73590243
CI: Enable Werror for FreeBSD and Xenial builds
2021-05-01 00:12:45 +02:00
bf08502b9c
Build: Add CMake option to enable Werror
...
With -DENABLE_WERROR the -Werror flag will be passed to the compiler failing the build if a warning is emitted.
2021-05-01 00:07:12 +02:00
202c4ef28c
copy array_diff sub into Object so we don't have the dependency
2021-04-29 19:00:36 -04:00
c74778f949
Revert "add new dependency libarray-util-perl"
...
This reverts commit 9e5ca7832a
2021-04-29 19:00:36 -04:00
6a1a94cece
Merge pull request #3226 from Carbenium/log-format
...
Fix logging format string mismatches
2021-04-29 18:29:56 -04:00
68bedfe48f
Fix logging format string mismatches
...
* Remove SZFMTD format macro and use %zu instead for size_t. %zu is understood by every compiler nowadays.
2021-04-30 00:26:24 +02:00
9e5ca7832a
add new dependency libarray-util-perl
2021-04-29 14:49:54 -04:00
e32771c255
Add Zones() to Monitor
2021-04-29 14:49:39 -04:00
69098ccdcb
Implement changes() in Object
2021-04-29 14:49:30 -04:00
c3dd8d8a47
Logger: Annotate logPrint with format attribute
...
This allows the compiler to check for mismatches in the format string and the passed parameters.
2021-04-29 17:12:44 +02:00
0da4127114
cleanup ready_count update unneeded. Fix crash on reload due to being disconnected.
2021-04-29 07:07:12 -04:00
3d11366c0f
restart stream when RTSP stream name changes
2021-04-29 06:38:42 -04:00
a8bd1662e3
Add objdetect.gif support in filter email replacements
2021-04-28 19:12:37 -04:00
5622429cc2
update RtspServer
2021-04-28 19:00:16 -04:00
b84efac0e5
left align Server head
2021-04-28 19:00:15 -04:00
4d18c515dc
dep/span-lite: Remove erroneously added zm-dependency-interface
...
This is a header-only library so there is no target to compile for which warnings could be disabled.
Moreover a target dependency with INTERFACE visibility propagates to the dependants. This disabled warnings further down the chain.
2021-04-29 00:08:40 +02:00
1abadfafa1
Increase debug log level of allocating image
2021-04-28 16:13:57 -04:00
e53628e0bd
Remove old deinterlace code, make new code in ::decode. For 4 field, use the next image in the queue isntead of doing another capture
2021-04-28 16:13:41 -04:00
ba652af347
Define deinterlace values in an enum
2021-04-28 16:13:10 -04:00
2302d814f2
Fix version test. split takes a regexp, so '.' matches everything. So change it to /\./.
2021-04-28 13:25:01 -04:00
a9ca6f8c13
Check for packets in the queue before we start traversing it to prevent crash
2021-04-28 12:12:24 -04:00
f754b82f3b
When we do not have permission to edit monitors, return empty string instead of nothing so that we don't generate an error
2021-04-28 12:03:44 -04:00
33ed35c1f6
Use new zmupdate -s param touse system maintenance use to perform updates
2021-04-28 10:05:21 -04:00
c50c30c6b5
Add super command line param to use mysql --defaults-file instead of zmuser/zmpass. This will only work for debian based systems.
2021-04-28 10:03:26 -04:00
f61618b244
rework rtsp_server to look for new and free up old monitors
2021-04-27 16:35:13 -04:00
953882a6da
Dirty hack to fix up/down arrows on pagination number input
2021-04-27 16:31:25 -04:00
0213c67236
add MinSectionLength
2021-04-27 15:25:09 -04:00
51d5b94650
Merge pull request #3224 from Carbenium/annotate-crash
...
Image: Fix crash in Annotate in GRAY8 and RGB24 mode
2021-04-27 15:15:58 -04:00
36205258c0
Image: Fix crash in Annotate in GRAY8 and RGB24 mode
...
Actually advance the image buffer pointer by one image line when looping through the codepoint lines.
2021-04-27 21:11:50 +02:00
Isaac Connor
Peter Keresztes Schmidt
Isaac Connor