View | Details | Raw Unified | Return to bug 210261 | Differences between
and this patch

Collapse All | Expand All

(-)zoneminder/Makefile (+6 lines)
Lines 41-46 Link Here
41
PHP=		json pdo_mysql session
41
PHP=		json pdo_mysql session
42
IGNORE_WITH_PHP=70
42
IGNORE_WITH_PHP=70
43
43
44
ONLY_FOR_ARCHS=	amd64 i386
45
44
OPTIONS_DEFINE=	NLS V4L DOCS
46
OPTIONS_DEFINE=	NLS V4L DOCS
45
OPTIONS_SUB=	yes
47
OPTIONS_SUB=	yes
46
NLS_USES=	gettext
48
NLS_USES=	gettext
Lines 76-81 Link Here
76
		-DHAVE_SENDFILE=0 \
78
		-DHAVE_SENDFILE=0 \
77
		-DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"
79
		-DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"
78
80
81
.if ${OSVERSION} < 1000000 && ${ARCH} == i386
82
CFLAGS+=	-msse
83
.endif
84
79
PKGMESSAGE=	${WRKDIR}/pkg-message
85
PKGMESSAGE=	${WRKDIR}/pkg-message
80
86
81
post-extract:
87
post-extract:
(-)zoneminder/files/patch-src_zm__image.cpp (+18 lines)
Line 0 Link Here
1
--- src/zm_image.cpp.orig	2016-06-01 00:41:17 UTC
2
+++ src/zm_image.cpp
3
@@ -1619,12 +1619,9 @@ Image *Image::Highlight( unsigned int n_
4
       for ( unsigned int j = 0; j < n_images; j++ )
5
       {
6
         uint8_t *psrc = images[j]->buffer+c;
7
-
8
-#ifndef SOLARIS
9
-        if ( (unsigned)abs((*psrc)-RGB_VAL(ref_colour,c)) >= RGB_VAL(threshold,c) )
10
-#else
11
-        if ( (unsigned)std::abs((*psrc)-RGB_VAL(ref_colour,c)) >= RGB_VAL(threshold,c) )
12
-#endif
13
+       unsigned int diff = ((*psrc)-RGB_VAL(ref_colour,c)) > 0 ? (*psrc)-RGB_VAL(ref_colour,c) : RGB_VAL(ref_colour,c) - (*psrc);
14
+        
15
+       if (diff >= RGB_VAL(threshold,c))
16
         {
17
           count++;
18
         }

Return to bug 210261