Attachment 171465 Details for Bug 210261 – patch3

[patch] patch3

zm.patch (text/plain), 1.51 KB, created by Ivan on 2016-06-15 17:34:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan

Created: 2016-06-15 17:34:40 UTC

Size: 1.51 KB

patch

obsolete

>diff -ruN zoneminder.orig/Makefile zoneminder/Makefile
>--- zoneminder.orig/Makefile	2016-06-13 23:06:32.838741000 +0300
>+++ zoneminder/Makefile	2016-06-15 20:31:26.751139000 +0300
>@@ -41,6 +41,8 @@
> PHP=		json pdo_mysql session
> IGNORE_WITH_PHP=70
> 
>+ONLY_FOR_ARCHS=	amd64 i386
>+
> OPTIONS_DEFINE=	NLS V4L DOCS
> OPTIONS_SUB=	yes
> NLS_USES=	gettext
>@@ -76,6 +78,10 @@
> 		-DHAVE_SENDFILE=0 \
> 		-DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"
> 
>+.if ${OSVERSION} < 1000000 && ${ARCH} == i386
>+CFLAGS+=	-msse
>+.endif
>+
> PKGMESSAGE=	${WRKDIR}/pkg-message
> 
> post-extract:
>diff -ruN zoneminder.orig/files/patch-src_zm__image.cpp zoneminder/files/patch-src_zm__image.cpp
>--- zoneminder.orig/files/patch-src_zm__image.cpp	1970-01-01 03:00:00.000000000 +0300
>+++ zoneminder/files/patch-src_zm__image.cpp	2016-06-13 23:07:57.839515000 +0300
>@@ -0,0 +1,18 @@
>+--- src/zm_image.cpp.orig	2016-06-01 00:41:17 UTC
>++++ src/zm_image.cpp
>+@@ -1619,12 +1619,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++;
>+         }

Actions: View | Diff

Attachments on bug 210261: 171398 | 171399 | 171465