ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,846 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

1117 Commits

Author SHA1 Message Date
Robin Daermann fc50b38331 collect variable name 2015-08-20 16:02:29 +02:00
Robin Daermann 52be185fc9 Support blacken zones in all colour depths 2015-08-20 15:58:13 +02:00
Robin Daermann 6fc4525784 Blacken Zones are now correctly displayed 2015-08-20 15:01:07 +02:00
Robin Daermann 8f9ed96585 First try to implement blacken areas for monitors 2015-08-20 14:20:41 +02:00
Andrew Bauer fe3595bfa1 Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval 
Conflicts:
	CMakeLists.txt
	configure.ac
	db/zm_update-1.28.101.sql
	src/zm_monitor.cpp
	src/zm_monitor.h
	version
 2015-08-18 20:20:53 -05:00
Andrew Bauer 2600b96f1b fix merge conflict in zm_monitor.cpp 2015-08-18 14:19:46 -05:00
Andrew Bauer 68adcc9e67 Merge branch 'large-timestamp' of https://github.com/schrorg/ZoneMinder into schrorg-large-timestamp 
Conflicts:
	CMakeLists.txt
	configure.ac
	src/zm_monitor.cpp
	src/zm_monitor.h
	version
 2015-08-18 14:07:38 -05:00
Linwood-F 987db68452 Fix extra image copy; fix options unset of exif toggle 2015-08-18 14:39:55 -04:00
Linwood-F 99c8af4a17 Bring up to date with master (mostly) 2015-08-17 22:52:51 -04:00
Linwood-F 3b9bb6053c Add clarifying comment 2015-08-17 22:10:39 -04:00
Linwood-F 9351e1b9d9 Incorporate exif switch 2015-08-17 22:07:41 -04:00
Robin Daermann 299c629a20 Merge remote-tracking branch 'upstream/master' into large-timestamp 
Conflicts:
	CMakeLists.txt
	configure.ac
	version
 2015-08-17 13:42:36 +02:00
Andrew Bauer 59c1b83d4f create embed_exif flag in Monitor class 2015-08-16 17:42:12 -05:00
Andrew Bauer 5b0288e5f5 use frame_type instead of score in conditional 2015-08-14 07:03:08 -05:00
Andrew Bauer 19174adfa1 add frame_type to debug message 2015-08-13 20:47:14 -05:00
Andrew Bauer 14dabb095c set scroe to zero if less than zero 2015-08-13 18:06:20 -05:00
Robin Daermann 3368d4f474 Removed untranslated "Font size" from language files, corrected white 
space and make font size a const int
 2015-08-10 15:35:19 +02:00
Robin Daermann 7f3a07f21b Add label size to monitor options (database and backend part) 
This commit bumps version to 1.28.101 because of database schema change
 2015-08-10 15:35:18 +02:00
Linwood-F 6aca6c8d26 Demote user auth info message to debug 2015-08-09 12:16:01 -04:00
Robin Daermann 5a0d0ca5a3 Made large font selectable by a constant 2015-08-06 17:42:52 +02:00
Robin Daermann c733fec476 First (working) steps for adding large timestamp to images 2015-08-06 14:43:10 +02:00
Isaac Connor d9ee08a27b Merge pull request #983 from Linwood-F/982-demote-terminating-logger-msg-to-debug 
Change from info to debug
 2015-08-04 10:12:08 -04:00
Isaac Connor a36bee3767 Merge pull request #984 from Linwood-F/507-shared-data-for-purpose-query-warning 
Remove shared data warning for purpose query only
 2015-08-04 10:09:59 -04:00
Linwood-F 546b0dd353 Remove shared data warning for purpose query only 2015-08-03 20:37:17 -04:00
Linwood-F 2538514d18 Change from info to debug 2015-08-03 18:39:14 -04:00
Isaac Connor 46b9bd5d1c change the captured image size to camera image size check to be a > instead of !=. As long as we have enough buffer space, it doesn't matter if the captured image is smaller than what we defined. 2015-07-31 10:29:53 -04:00
Emmanuel Papin f7cfa1ecd4 Fix analysis sample rate calculation 2015-07-28 23:07:02 +02:00
Emmanuel Papin 93990b253f Use a dedicated pre event buffer if analysis_fps is set 2015-07-27 16:24:32 +02:00
Emmanuel Papin 18758826c7 Do not call time() function when it is not necessary 2015-07-25 13:46:11 +02:00
Emmanuel Papin 0bff99f5c7 Improve string conversion and use unsigned type for analysis_update_delay 2015-07-25 13:38:50 +02:00
Isaac Connor 3e5f6c65d3 Fix to scale, moving the +1's into the buffer allocation instead of calculation of new_width and new_height 2015-07-24 13:30:58 -04:00
Linwood-F 965425c395 Remove extraneous file 2015-07-23 19:37:23 -04:00
Linwood-F 72a92ee9d5 Add exif to jpg images saved 2015-07-23 19:34:39 -04:00
Emmanuel Papin 9e16c8a066 Improve log message and logic in UpdateAdaptiveSkip() 2015-07-24 01:01:51 +02:00
Emmanuel Papin 3b2378c21d Add a new warning in GetAnalysisRate function 2015-07-24 00:26:53 +02:00
Emmanuel Papin 649a39b372 Replace analysis interval parameter by analysis framerate 2015-07-23 16:36:30 -04:00
Emmanuel Papin 132e0a1798 Add analysis fps paramter to monitors 2015-07-22 21:38:35 +02:00
Emmanuel Papin a6b7c6e99f Add analysis interval parameter to monitors 2015-07-21 22:52:52 +02:00
Isaac Connor 48fa0c3d42 add some utility db functions 2015-07-16 13:04:28 -04:00
Andrew Bauer a9035221cb Merge pull request #934 from ZoneMinder/fix_utf 
fix utf8 ' characters
 2015-07-15 10:30:28 -05:00
Isaac Connor 33a9fc6175 fix utf8 ' characters 2015-07-15 10:37:08 -04:00
Isaac Connor 602f703df8 roudn up when calculating buffer size for scaled image. Fixes #932 2015-07-15 10:22:57 -04:00
Andrew Bauer bce968ebd8 Merge pull request #923 from ZoneMinder/zm_buffer_improvements 
Introduce a read_into function in the Buffer.
 2015-07-13 18:51:38 -05:00
Isaac Connor 8b2f67c456 don't include .cpp in man 2015-07-13 11:30:32 -04:00
Andy Bauer 561bf43721 fix pod2man generation for out-of-source builds 2015-07-09 19:33:06 -05:00
Isaac Connor 994de4ae0a Introduce a read_into function in the Buffer. Use it when reading over http from a camera to remove an extra mem copy. Limit reads to 1 network buffer instead of reading everything that is available. 2015-07-06 15:57:06 -04:00
Steve Gilvarry 39d152656a Merge pull request #920 from ZoneMinder/zms_no_crash 
Zms no crash
 2015-07-04 06:58:32 +10:00
Isaac Connor 58448adb51 Merge pull request #896 from knnniggett/pod2man 
Generate man pages for perl scripts & C Binaries in the bin folder
 2015-07-03 11:40:24 -04:00
Isaac Connor 3c5a9b796b Merge branch 'master' into zms_no_crash 2015-07-03 11:34:42 -04:00
Isaac Connor 956e2936a3 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-06-25 16:26:49 -04:00