diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2018-02-23 21:05:09 +0100 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2018-02-23 21:05:36 +0100 |
| commit | 8a08ba0f7e93e5da33fe28e39a88e713e497f7f5 (patch) | |
| tree | 06483e3755e5f81463f39a27544abc9b454d816a /www-misc/zoneminder/files/zoneminder-1.30.4-gcc7.patch | |
| parent | mail-client/alot: version bump to 0.7. (diff) | |
| download | gentoo-8a08ba0f7e93e5da33fe28e39a88e713e497f7f5.tar.gz gentoo-8a08ba0f7e93e5da33fe28e39a88e713e497f7f5.tar.bz2 gentoo-8a08ba0f7e93e5da33fe28e39a88e713e497f7f5.zip | |
www-misc/zoneminder: Make this actually build
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'www-misc/zoneminder/files/zoneminder-1.30.4-gcc7.patch')
| -rw-r--r-- | www-misc/zoneminder/files/zoneminder-1.30.4-gcc7.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/www-misc/zoneminder/files/zoneminder-1.30.4-gcc7.patch b/www-misc/zoneminder/files/zoneminder-1.30.4-gcc7.patch new file mode 100644 index 000000000000..b022fbe35e17 --- /dev/null +++ b/www-misc/zoneminder/files/zoneminder-1.30.4-gcc7.patch @@ -0,0 +1,28 @@ +From 97380f009b0e6a8bb6ee4ecbf0436045342cdf1e Mon Sep 17 00:00:00 2001 +From: abishai <abi@abinet.ru> +Date: Tue, 31 Jan 2017 10:42:57 +0300 +Subject: [PATCH] implement platform-agnostic comparison without abs() + +--- + src/zm_image.cpp | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/src/zm_image.cpp b/src/zm_image.cpp +index 9c8c12fda..80a821376 100644 +--- a/src/zm_image.cpp ++++ b/src/zm_image.cpp +@@ -1658,11 +1658,9 @@ Image *Image::Highlight( unsigned int n_images, Image *images[], const Rgb thres + { + uint8_t *psrc = images[j]->buffer+c; + +-#ifndef SOLARIS +- if ( (unsigned)abs((*psrc)-RGB_VAL(ref_colour,c)) >= RGB_VAL(threshold,c) ) +-#else +- if ( (unsigned)std::abs((*psrc)-RGB_VAL(ref_colour,c)) >= RGB_VAL(threshold,c) ) +-#endif ++ unsigned int diff = ((*psrc)-RGB_VAL(ref_colour,c)) > 0 ? (*psrc)-RGB_VAL(ref_colour,c) : RGB_VAL(ref_colour,c) - (*psrc); ++ ++ if (diff >= RGB_VAL(threshold,c)) + { + count++; + } |