multimedia/zoneminder-h264/files/patch-src_zm__image.cpp


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18

--- src/zm_image.cpp.orig	2016-10-03 17:21:50 UTC
+++ src/zm_image.cpp
@@ -1649,12 +1649,9 @@ Image *Image::Highlight( unsigned int n_
       for ( unsigned int j = 0; j < n_images; j++ )
       {
         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++;
         }