implement platform-agnostic comparison without abs()

ZoneMinder · Jan 31, 2017 · 97380f0 · 97380f0
1 parent 9e9b1a3
commit 97380f0
Showing 1 changed file with 3 additions and 5 deletions.
diff --git 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++;
         }