Commit Graph

3363 Commits

Author SHA1 Message Date
Isaac Connor 7b1ca0e66d Use the new DecodingEnabled function 2020-12-10 14:05:57 -05:00
Isaac Connor 7f72d5399f add decoding_enabled and DecodingEnabled function 2020-12-10 14:05:46 -05:00
Isaac Connor c65e63798d Don't do decode when in RECORD OR NODECT and passthrough and no jpegs 2020-12-10 13:47:30 -05:00
Isaac Connor 36b5702c50 Increase LinkedMonitor debugging. Fix LinkedMonitors. Fixes #3091 2020-12-05 19:36:44 -05:00
Isaac Connor 4d33667a85 Merge branch 'release-1.34' 2020-12-05 16:51:42 -05:00
hax0kartik 8012438573 Fix font rendering issue 2020-12-04 05:22:54 +05:30
Isaac Connor b2e5df1854 Need to -1 to size parameter when calling SetFontSize 2020-12-03 18:31:41 -05:00
Isaac Connor 1bbcf4ea31 spacing and make assignments a little more readable/efficient maybe 2020-12-03 16:43:27 -05:00
Isaac Connor 330327ded0 Improve code readability. Use a define for header size 2020-12-03 16:21:18 -05:00
Isaac Connor cfd4c17953 Include invalid font path in the error message 2020-12-03 13:35:12 -05:00
Isaac Connor c8aac87f74 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-12-03 10:26:27 -05:00
Bluemax d8993931da Improve group permissions (mode 660)
Make /dev/shm files 660.
2020-12-02 21:27:00 +01:00
hax0kartik 59d5860560 Merge branch 'Font' of https://github.com/hax0kartik/zoneminder into Font 2020-12-02 09:45:16 +05:30
hax0kartik 1ec13f3d06 Free font->data only when font itself is valid 2020-12-02 09:44:49 +05:30
Isaac Connor ff2981b9b3 code style. Remove unused members. Make WriteFrameImage const 2020-12-01 09:53:51 -05:00
Isaac Connor 836cd2d58d Merge branch 'Font' of https://github.com/hax0kartik/zoneminder into font 2020-11-30 09:45:39 -05:00
hax0kartik d290ffc1b3 Set individual rgb components instead of memset which is wrong 2020-11-30 17:57:59 +05:30
Isaac Connor 159edbfce9 Fix video file having wrong id 2020-11-29 16:25:33 -05:00
hax0kartik 32e2563643 Free font data when destructor is called 2020-11-29 10:53:20 +05:30
hax0kartik 890a52605f Satisfy cpplint 2020-11-29 10:25:06 +05:30
hax0kartik bbeb599fce Remove bigfont 2020-11-28 20:28:34 +05:30
hax0kartik b212b0e450 Allow modifying font file location 2020-11-28 20:18:17 +05:30
hax0kartik 0a7b7b9661 Bound check values 2020-11-28 19:44:45 +05:30
hax0kartik 528699f942 Use ctzll + new font format for improving drawing speed 2020-11-28 18:46:20 +05:30
Isaac Connor 3a943d6f09 Add ServerId method, code style 2020-11-27 13:29:05 -05:00
Isaac Connor 95cbc053fc Try other storage areas if we fail to create event dir on the assigned area. 2020-11-27 13:28:38 -05:00
Isaac Connor a6245d9e90 Minor code style update 2020-11-27 13:27:51 -05:00
Isaac Connor d6345d32fd Reduce error level of warnings about monitors having Function==NONE 2020-11-25 09:53:06 -05:00
Isaac Connor e0a30ab5e0 Only log an error if we haven't been given sigpipe. 2020-11-22 17:28:53 -05:00
Isaac Connor 660636c0e2 loop if we get egain when flocking. Warn when format not specified. 2020-11-22 16:54:42 -05:00
Isaac Connor 4d8f45d284 There is no need to copy query. We do not modify it. 2020-11-21 16:59:21 -05:00
Isaac Connor 1b472edc2b fix cast 2020-11-21 16:58:22 -05:00
Isaac Connor 6da673dd69 remove unused includes 2020-11-21 09:25:36 -05:00
Isaac Connor 5f4fb4200f googe code style 2020-11-21 09:25:10 -05:00
Isaac Connor 2cdf0da3c0 Remove unused includes and apply google code style 2020-11-21 09:15:36 -05:00
Isaac Connor 7653a058a3 More correct code for setting source 2020-11-20 16:31:40 -05:00
Isaac Connor e1a0c4f973 Don't log a warning of comms not open if no connkey 2020-11-20 16:31:12 -05:00
Isaac Connor 65d4c43cc2 Use BOUNDARY instead of ZoneMinderFrame. If we get EAGAIN when flocking, try again. 2020-11-20 16:29:10 -05:00
Isaac Connor 4f178e47bc Break early after setting zm_terminate so that zms quits faster. Use a basic assignment instead of memcpy for last_frame_timestamp 2020-11-19 16:39:53 -05:00
Isaac Connor 03f033cf36 cleanup MOnitor destructor. Most of the freeing is done in disconnect now. Fixes zms crash 2020-11-19 16:39:14 -05:00
Isaac Connor 3f1e7e793f update buffertype after DumpBUffer 2020-11-19 16:38:49 -05:00
Isaac Connor 58ccea6aa8 use better c++ class initialisation. Use ZM_BUFTYPE_DONTFREE instead of 0 for init buffertype. 2020-11-19 16:37:28 -05:00
Isaac Connor 634a3dbe81 fix crashes/memleaks when waiting for a zmc process to start. Fix other memleaks 2020-11-19 10:43:02 -05:00
Isaac Connor ae4e2a1d5e We were overwriting the privacy/inactive zone with a more general one. Slight memleak 2020-11-19 10:42:17 -05:00
Isaac Connor 74972be9b5 spacing, code style. Set row=nullptr to quiet valgrind 2020-11-18 13:15:52 -05:00
Isaac Connor d4253be69f Use proper C++ initializer for Config. Don't copy the sql string, just use it from whereever in ram it is. 2020-11-18 13:15:07 -05:00
Isaac Connor 6542072334 fix logic causing segfault instead of waiting for zmc. Remove trailing whitespaces 2020-11-18 09:56:13 -05:00
Isaac Connor 9713a2ec00 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-11-17 11:09:31 -05:00
Isaac Connor d5295a4464 Fix segfaults and valgrind complaints. Initialize vncClientData, handle failure to connect freeing our client. 2020-11-17 11:08:11 -05:00
Isaac Connor d2a203014f rename diagpipe-r so that we don't have to create directories in SOCKS_DIR 2020-11-13 17:05:03 -05:00