svn commit: r445722 - in head/graphics/pfstools: . files

[Richard Gallamore]

Author: ultima
Date: Fri Jul 14 01:45:43 2017
New Revision: 445722
URL: https://svnweb.freebsd.org/changeset/ports/445722

Log:
  * Fix qt option build
  * Changed OCTAVE USES to option helper
  
  PR:		220247
  Submitted by:	Iouri V. Ivliev <fbsd at any.com.ru> (maintainer)
  Reported by:	Jov <amutu at amutu.com>
  Reviewed by:	lifanov (mentor), matthew (mentor), matt
  Approved by:	lifanov (mentor)
  Differential Revision:	https://reviews.freebsd.org/D11495

Modified:
  head/graphics/pfstools/Makefile
  head/graphics/pfstools/files/patch-src-filter-pfswb.cpp
  head/graphics/pfstools/files/patch-src-pfs-pfs.h

Modified: head/graphics/pfstools/Makefile
==============================================================================
--- head/graphics/pfstools/Makefile	Fri Jul 14 00:21:29 2017	(r445721)
+++ head/graphics/pfstools/Makefile	Fri Jul 14 01:45:43 2017	(r445722)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pfstools
 PORTVERSION=	1.8.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -60,6 +60,7 @@ OCTAVE_CONFIGURE_ENABLE=	octave
 OCTAVE_PATCH_DEPENDS=		octave-config:math/octave
 OCTAVE_BUILD_DEPENDS=		mkoctfile:math/octave
 OCTAVE_RUN_DEPENDS=		octave:math/octave
+OCTAVE_USES=			shebangfix
 
 .include <bsd.port.options.mk>
 
@@ -72,7 +73,6 @@ PLIST_SUB+=	\
 		OCTAVE_BASE=${OCTAVE_BASE} \
 		OCTAVE_SITE_M=${OCTAVE_SITE_M:S|^${OCTAVE_BASE}/||} \
 		OCTAVE_SITE_OCT=${OCTAVE_SITE_OCT:S|^${OCTAVE_BASE}/||}
-USES+=		shebangfix
 SHEBANG_FILES=	src/octave/*
 SHEBANG_LANG+=	octave
 octave_OLD_CMD?=/usr/bin/octave

Modified: head/graphics/pfstools/files/patch-src-filter-pfswb.cpp
==============================================================================
--- head/graphics/pfstools/files/patch-src-filter-pfswb.cpp	Fri Jul 14 00:21:29 2017	(r445721)
+++ head/graphics/pfstools/files/patch-src-filter-pfswb.cpp	Fri Jul 14 01:45:43 2017	(r445722)
@@ -1,6 +1,6 @@
---- src/filter/pfswb.cpp.orig	2016-02-12 17:10:27 UTC
+--- src/filter/pfswb.cpp.orig	2016-08-12 19:10:44 UTC
 +++ src/filter/pfswb.cpp
-@@ -0,0 +1,297 @@
+@@ -0,0 +1,299 @@
 +/**
 + * @file pfswb.cpp
 + * @brief Adjust white balance in RGB color space
@@ -184,10 +184,12 @@
 +      float nmin = 1e20, nmax = -1e20;
 +      for (int i=s; i--; )
 +      {
-+        float const &l = ((*Y)(i)-amin)*k+min;
++        float const l = ((*Y)(i)-amin)*k+min;
 +        if (nmin > l) nmin = l;
 +        if (nmax < l) nmax = l;
 +        (*Y)(i) = l;
++        (*X)(i) *= k;
++        (*Z)(i) *= k;
 +      }
 +      VERBOSE_STR << "restored luminance range: " << nmin << ":" << nmax << std::endl;
 +    }

Modified: head/graphics/pfstools/files/patch-src-pfs-pfs.h
==============================================================================
--- head/graphics/pfstools/files/patch-src-pfs-pfs.h	Fri Jul 14 00:21:29 2017	(r445721)
+++ head/graphics/pfstools/files/patch-src-pfs-pfs.h	Fri Jul 14 01:45:43 2017	(r445722)
@@ -43,3 +43,12 @@
  	}
  			
        ~Exception() {};
+@@ -590,7 +596,7 @@ namespace pfs
+        *
+        * @return text description of the cause for the exception
+        */
+-      const char* getMessage()
++      const char* getMessage() const
+         {
+           return msg;
+ 	}