<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fa032984a531c5e787b026d5db358e1dea568505">https://github.com/macports/macports-ports/commit/fa032984a531c5e787b026d5db358e1dea568505</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fa032984a531c5e787b026d5db358e1dea568505
</span>Author: mcalhoun@macports.org <mcalhoun@macports.org>
AuthorDate: Sat Aug 12 15:27:02 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> vigra: patch template instantiation
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/54548
</span><span style='display:block; white-space:pre;color:#404040;'> No revbump since port either builds correctly or not at all
</span>---
graphics/vigra/Portfile | 3 +
graphics/vigra/files/patch-template.diff | 139 +++++++++++++++++++++++++++++++
2 files changed, 142 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vigra/Portfile b/graphics/vigra/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0623689..fd69adb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/vigra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/vigra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,6 +37,9 @@ depends_lib port:jpeg \
</span>
patchfiles patch-include-vigra-hdf5impex.hxx.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/54548
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-template.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace "s|@DOCDIR@|${prefix}/share/doc/${name}|g" ${worksrcpath}/config/vigra-config.in
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vigra/files/patch-template.diff b/graphics/vigra/files/patch-template.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..63956e5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/vigra/files/patch-template.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,139 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 81958d302494e137f98a8b1d7869841532f90388 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: JaimeIvanCervantes <jimmycc80@hotmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 16 Jun 2017 13:21:45 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] multi_convolution: Fix for incorrect template parameter type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ when using unsigned int N for TinyVector SIZE. (Fixes #414)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include/vigra/multi_convolution.hxx | 28 ++++++++++++++--------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 14 insertions(+), 14 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/include/vigra/multi_convolution.hxx b/include/vigra/multi_convolution.hxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1b5efa740..ec89bcf58 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/vigra/multi_convolution.hxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/vigra/multi_convolution.hxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1426,7 +1426,7 @@ gaussianSmoothMultiArray(MultiArrayView<N, T1, S1> const & source,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class T2, class S2>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double sigma,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ConvolutionOptions<N> opt = ConvolutionOptions<N>());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1435,7 +1435,7 @@ gaussianSmoothMultiArray(MultiArrayView<N, T1, S1> const & source,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class T2, class S2>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ConvolutionOptions<N> opt);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // likewise, but execute algorithm in parallel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1443,7 +1443,7 @@ gaussianSmoothMultiArray(MultiArrayView<N, T1, S1> const & source,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class T2, class S2>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BlockwiseConvolutionOptions<N> opt);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \endcode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1590,7 +1590,7 @@ template <unsigned int N, class T1, class S1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class T2, class S2>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ConvolutionOptions<N> opt )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(opt.to_point != typename MultiArrayShape<N>::type())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1614,7 +1614,7 @@ template <unsigned int N, class T1, class S1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class T2, class S2>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double sigma,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ConvolutionOptions<N> opt = ConvolutionOptions<N>())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1653,7 +1653,7 @@ gaussianGradientMagnitudeImpl(MultiArrayView<N+1, T1, S1> const & src,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dest.init(0.0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef typename NumericTraits<T1>::RealPromote TmpType;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MultiArray<N, TinyVector<TmpType, N> > grad(dest.shape());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MultiArray<N, TinyVector<TmpType, int(N)> > grad(dest.shape());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace multi_math;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1771,7 +1771,7 @@ gaussianGradientMagnitude(MultiArrayView<N+1, Multiband<T1>, S1> const & src,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class T2, class S2>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ symmetricGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ConvolutionOptions<N> opt = ConvolutionOptions<N>());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // execute algorithm in parallel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1779,7 +1779,7 @@ gaussianGradientMagnitude(MultiArrayView<N+1, Multiband<T1>, S1> const & src,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class T2, class S2>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ symmetricGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BlockwiseConvolutionOptions<N> opt);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \endcode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1895,7 +1895,7 @@ template <unsigned int N, class T1, class S1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class T2, class S2>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ symmetricGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ConvolutionOptions<N> opt = ConvolutionOptions<N>())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(opt.to_point != typename MultiArrayShape<N>::type())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2214,14 +2214,14 @@ laplacianOfGaussianMultiArray(MultiArrayView<N, T1, S1> const & source,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template <unsigned int N, class T1, class S1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class T2, class S2>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MultiArrayView<N, T2, S2> divergence,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ConvolutionOptions<N> const & opt);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template <unsigned int N, class T1, class S1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class T2, class S2>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MultiArrayView<N, T2, S2> divergence,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double sigma,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ConvolutionOptions<N> opt = ConvolutionOptions<N>());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2231,7 +2231,7 @@ laplacianOfGaussianMultiArray(MultiArrayView<N, T1, S1> const & source,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template <unsigned int N, class T1, class S1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class T2, class S2>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MultiArrayView<N, T2, S2> divergence,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BlockwiseConvolutionOptions<N> const & opt);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2324,7 +2324,7 @@ gaussianDivergenceMultiArray(Iterator vectorField, Iterator vectorFieldEnd,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template <unsigned int N, class T1, class S1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class T2, class S2>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MultiArrayView<N, T2, S2> divergence,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ConvolutionOptions<N> const & opt)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2338,7 +2338,7 @@ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & ve
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template <unsigned int N, class T1, class S1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class T2, class S2>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MultiArrayView<N, T2, S2> divergence,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double sigma,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ConvolutionOptions<N> opt = ConvolutionOptions<N>())
</span></pre><pre style='margin:0'>
</pre>