D6854.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D6854.diff
View Options

	Index: head/multimedia/zoneminder/Makefile
	===================================================================
	--- head/multimedia/zoneminder/Makefile
	+++ head/multimedia/zoneminder/Makefile
	@@ -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:
	Index: head/multimedia/zoneminder/files/patch-src_zm__image.cpp
	===================================================================
	--- head/multimedia/zoneminder/files/patch-src_zm__image.cpp
	+++ head/multimedia/zoneminder/files/patch-src_zm__image.cpp
	@@ -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++;
	+ }