Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 21 Nov 2015 00:21:34 +0000 (UTC)
From:      Greg Lehey <grog@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r402112 - in head/graphics/hugin: . files
Message-ID:  <201511210021.tAL0LYLI078290@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: grog (src committer)
Date: Sat Nov 21 00:21:34 2015
New Revision: 402112
URL: https://svnweb.freebsd.org/changeset/ports/402112

Log:
  Hopefully win my battle with svn and finally check in the correct set
  of patch files.
  
  Approved by:	edwin@ (long-suffering mentor)
  MFC after:	2 weeks

Added:
  head/graphics/hugin/files/patch-src__tools__align_image_stack.cpp   (contents, props changed)
  head/graphics/hugin/files/patch-src__tools__tca_correct.cpp   (contents, props changed)
Modified:
  head/graphics/hugin/Makefile

Modified: head/graphics/hugin/Makefile
==============================================================================
--- head/graphics/hugin/Makefile	Fri Nov 20 23:34:39 2015	(r402111)
+++ head/graphics/hugin/Makefile	Sat Nov 21 00:21:34 2015	(r402112)
@@ -3,7 +3,7 @@
 
 PORTNAME=	hugin
 PORTVERSION=	2015.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
 

Added: head/graphics/hugin/files/patch-src__tools__align_image_stack.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/hugin/files/patch-src__tools__align_image_stack.cpp	Sat Nov 21 00:21:34 2015	(r402112)
@@ -0,0 +1,20 @@
+--- src/tools/align_image_stack.cpp~	2015-10-31 11:10:56.000000000 +1100
++++ src/tools/align_image_stack.cpp	2015-10-29 13:09:52.000000000 +1100
+@@ -121,7 +121,7 @@
+ }
+ 
+ typedef std::multimap<double, vigra::Diff2D> MapPoints;
+-static hugin_omp::Lock lock;
++static hugin_omp::Lock slock;
+ 
+ template <class ImageType>
+ void FineTuneInterestPoints(Panorama& pano,
+@@ -193,7 +193,7 @@
+                        res.maxpos.y,
+                        stereo ? ControlPoint::Y : ControlPoint::X_Y);
+         {
+-            hugin_omp::ScopedLock sl(lock);
++            hugin_omp::ScopedLock sl(slock);
+             pano.addCtrlPoint(p);
+         };
+     }

Added: head/graphics/hugin/files/patch-src__tools__tca_correct.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/hugin/files/patch-src__tools__tca_correct.cpp	Sat Nov 21 00:21:34 2015	(r402112)
@@ -0,0 +1,20 @@
+--- src/tools/tca_correct.cpp~	2015-10-31 11:10:44.000000000 +1100
++++ src/tools/tca_correct.cpp	2015-10-29 13:14:14.000000000 +1100
+@@ -465,7 +465,7 @@
+          << "    commandline arguments for fulla" << endl;
+ }
+ 
+-static hugin_omp::Lock lock;
++static hugin_omp::Lock slock;
+ typedef std::multimap<double, vigra::Diff2D> MapPoints;
+ 
+ template <class ImageType>
+@@ -584,7 +584,7 @@
+         }
+         if (!cps.empty())
+         {
+-            hugin_omp::ScopedLock sl(lock);
++            hugin_omp::ScopedLock sl(slock);
+             for (CPVector::const_iterator it = cps.begin(); it != cps.end(); ++it)
+             {
+                 pano.addCtrlPoint(*it);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511210021.tAL0LYLI078290>