Commit Graph

32 Commits

Author SHA1 Message Date
Isaac Connor 8125ef0334 change types and move things around to remove compile warnings 2015-10-02 09:49:09 -04:00
Robin Daermann 5b465194f8 Renamed 'Blacken' zone type to 'Privacy' 2015-08-20 17:37:59 +02:00
Robin Daermann acacd247c8 Really blacken all pixel colours 2015-08-20 17:17:58 +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 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 99c8af4a17 Bring up to date with master (mostly) 2015-08-17 22:52:51 -04: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
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 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 72a92ee9d5 Add exif to jpg images saved 2015-07-23 19:34:39 -04:00
Isaac Connor 602f703df8 roudn up when calculating buffer size for scaled image. Fixes #932 2015-07-15 10:22:57 -04:00
Rick Sayre 12516da3dc Patched in changes to 1.28.1 to allow OmniOS/Illumos to build and work
haven't attempted to build yet, there are some changes
2015-05-17 17:18:54 -07:00
Dmitry Smirnov eddada011c spelling corrections (thanks, /usr/bin/codespell) 2015-04-19 20:38:23 +10:00
Isaac Connor 065a372678 one small fix for a log line where the 4th parameter wasn't included. The rest are very small optimisations. 2015-04-10 13:26:17 -04:00
Emmanuel Papin 41edb4d958 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into memory_fix_leaks 2014-11-29 03:38:45 +01:00
Isaac Connor 00287ab5dd more debug output when buffer is undersized. 2014-11-25 14:51:20 -05:00
manupap1 9eee62c6d2 Fix memory leaks in Image class 2014-11-15 12:58:08 +01:00
Isaac Connor c9e04e48bb Am remarking out some Debugs that would only be useful to someone debugging image code. Of no use to end users and get called so much that must cause a performance problem, especially when debug logging is actually turned on 2014-09-18 15:44:53 -04:00
Kfir Itzhak 4de46c7988 Fix wrong values used for type boolean 2014-05-05 09:26:32 +03:00
Andrew Bauer 69f6af93d1 Patch for Debian bug 736516 - FTBFS on powerpc arch. 2014-03-16 10:51:54 -05:00
Peter Howard 5786af0d4e Added missing x86 compile guards to zm_image.cpp. This should allow ZoneMinder to at least build again on non-x86 architectures. 2014-01-23 14:49:46 +11:00
Isaac Connor f6bf3743f7 very sub-optimisation, removing duplicate comparisons 2013-11-04 10:50:40 -05:00
Kfir Itzhak 8cecadadc2 Fix rotation bug caused by commit 5a9364703c 2013-10-10 06:55:45 +03:00
mastertheknife c526fcedd7 Fix an issue created by commit 2b568906e5: Log flooded with image dimensions differ errors 2013-09-24 07:15:37 +03:00
mastertheknife 5a9364703c a better fix for the sign comparison warnings during compilation 2013-09-17 10:28:59 +03:00
mastertheknife c3f7af7cd1 Fix sign warning during compilation 2013-09-15 04:13:09 +03:00
mastertheknife 2b568906e5 Fixed greyscale four field deinterlacing not processing last line, broken ssse3 color->greyscale conversion and improved error handling when reading\decoding jpegs 2013-09-10 18:37:56 +03:00
nextime 33cbd89212 Migrate svn to git 2013-03-17 00:45:21 +01:00