diff options
author | Stephen Montgomery-Smith <stephen@FreeBSD.org> | 2021-02-21 22:41:34 +0000 |
---|---|---|
committer | Stephen Montgomery-Smith <stephen@FreeBSD.org> | 2021-02-21 22:41:34 +0000 |
commit | 6473aac25b6dc63be299faa4fc1ed9cde77f1957 (patch) | |
tree | 5f81e978342b34ec7b1784c80dc5be7182d55dcf /math/octave-forge-nurbs | |
parent | e906f6434c9ac6119ad6536e7f73592e5d69d557 (diff) | |
download | ports-6473aac25b6dc63be299faa4fc1ed9cde77f1957.tar.gz ports-6473aac25b6dc63be299faa4fc1ed9cde77f1957.zip |
Notes
Diffstat (limited to 'math/octave-forge-nurbs')
5 files changed, 77 insertions, 1 deletions
diff --git a/math/octave-forge-nurbs/Makefile b/math/octave-forge-nurbs/Makefile index 4b237c3ed99e..545a4e15e46b 100644 --- a/math/octave-forge-nurbs/Makefile +++ b/math/octave-forge-nurbs/Makefile @@ -3,7 +3,7 @@ PORTNAME= octave-forge-nurbs PORTVERSION= 1.3.13 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org diff --git a/math/octave-forge-nurbs/files/patch-bspeval.cc b/math/octave-forge-nurbs/files/patch-bspeval.cc new file mode 100644 index 000000000000..fa41bda956b3 --- /dev/null +++ b/math/octave-forge-nurbs/files/patch-bspeval.cc @@ -0,0 +1,11 @@ +--- bspeval.cc.orig 2021-02-21 22:35:52 UTC ++++ bspeval.cc +@@ -113,7 +113,7 @@ static bool bspeval_bad_arguments (const octave_value_ + error("bspeval: the knot vector should be a real vector."); + return true; + } +- if (!args(3).is_real_type()) ++ if (!args(3).isreal()) + { + error("bspeval: the set of parametric points should be an array of doubles."); + return true; diff --git a/math/octave-forge-nurbs/files/patch-nrb__srf__basisfun____.cc b/math/octave-forge-nurbs/files/patch-nrb__srf__basisfun____.cc new file mode 100644 index 000000000000..45e29de24161 --- /dev/null +++ b/math/octave-forge-nurbs/files/patch-nrb__srf__basisfun____.cc @@ -0,0 +1,20 @@ +--- nrb_srf_basisfun__.cc.orig 2021-02-21 22:34:12 UTC ++++ nrb_srf_basisfun__.cc +@@ -66,7 +66,7 @@ DEFUN_DLD(nrb_srf_basisfun__, args, nargout,"\ + } // spu = findspan (m, p, u, U); + + newargs(3) = U; newargs(2) = p; newargs(1) = u; newargs(0) = spu; +- Matrix Ik = feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Ik = numbasisfun (spu, u, p, U); ++ Matrix Ik = octave::feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Ik = numbasisfun (spu, u, p, U); + + RowVector spv(v); + for (octave_idx_type ii(0); ii < v.numel (); ii++) +@@ -75,7 +75,7 @@ DEFUN_DLD(nrb_srf_basisfun__, args, nargout,"\ + } // spv = findspan (n, q, v, V); + + newargs(3) = V; newargs(2) = q; newargs(1) = v; newargs(0) = spv; +- Matrix Jk = feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Jk = numbasisfun (spv, v, q, V); ++ Matrix Jk = octave::feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Jk = numbasisfun (spv, v, q, V); + + Matrix NuIkuk(npt, p+1, 0.0); + for (octave_idx_type ii(0); ii < npt; ii++) diff --git a/math/octave-forge-nurbs/files/patch-nrb__srf__basisfun__der____.cc b/math/octave-forge-nurbs/files/patch-nrb__srf__basisfun__der____.cc new file mode 100644 index 000000000000..64fce6926177 --- /dev/null +++ b/math/octave-forge-nurbs/files/patch-nrb__srf__basisfun__der____.cc @@ -0,0 +1,34 @@ +--- nrb_srf_basisfun_der__.cc.orig 2021-02-21 22:32:34 UTC ++++ nrb_srf_basisfun_der__.cc +@@ -73,7 +73,7 @@ DEFUN_DLD(nrb_srf_basisfun_der__, args, nargout,"\ + } // spu = findspan (m, p, u, U); + + newargs(3) = U; newargs(2) = p; newargs(1) = u; newargs(0) = spu; +- Matrix Ik = feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Ik = numbasisfun (spu, u, p, U); ++ Matrix Ik = octave::feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Ik = numbasisfun (spu, u, p, U); + + RowVector spv(v); + for (octave_idx_type ii(0); ii < v.numel (); ii++) +@@ -82,7 +82,7 @@ DEFUN_DLD(nrb_srf_basisfun_der__, args, nargout,"\ + } // spv = findspan (n, q, v, V); + + newargs(3) = V; newargs(2) = q; newargs(1) = v; newargs(0) = spv; +- Matrix Jk = feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Jk = numbasisfun (spv, v, q, V); ++ Matrix Jk = octave::feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Jk = numbasisfun (spv, v, q, V); + + Matrix NuIkuk(npt, p+1, 0.0); + for (octave_idx_type ii(0); ii < npt; ii++) +@@ -100,11 +100,11 @@ DEFUN_DLD(nrb_srf_basisfun_der__, args, nargout,"\ + + + newargs(4) = 1; newargs(3) = U; newargs(2) = u; newargs(1) = p; newargs(0) = spu; +- NDArray NuIkukprime = feval (std::string("basisfunder"), newargs, 1)(0).array_value (); // NuIkukprime = basisfunder (spu, p, u, U, 1); ++ NDArray NuIkukprime = octave::feval (std::string("basisfunder"), newargs, 1)(0).array_value (); // NuIkukprime = basisfunder (spu, p, u, U, 1); + // NuIkukprime = squeeze(NuJkukprime(:,2,:)); + + newargs(4) = 1; newargs(3) = V; newargs(2) = v; newargs(1) = q; newargs(0) = spv; +- NDArray NvJkvkprime = feval (std::string("basisfunder"), newargs, 1)(0).array_value (); // NvJkvkprime = basisfunder (spv, q, v, V, 1); ++ NDArray NvJkvkprime = octave::feval (std::string("basisfunder"), newargs, 1)(0).array_value (); // NvJkvkprime = basisfunder (spv, q, v, V, 1); + // NvJkvkprime = squeeze(NvJkvkprime(:,2,:)); + + for (octave_idx_type k(0); k < npt; k++) diff --git a/math/octave-forge-nurbs/files/patch-tbasisfun.cc b/math/octave-forge-nurbs/files/patch-tbasisfun.cc new file mode 100644 index 000000000000..ff2d644f502c --- /dev/null +++ b/math/octave-forge-nurbs/files/patch-tbasisfun.cc @@ -0,0 +1,11 @@ +--- tbasisfun.cc.orig 2021-02-21 22:37:09 UTC ++++ tbasisfun.cc +@@ -156,7 +156,7 @@ TBASISFUN: Compute a B- or T-Spline basis function, an + RowVector N(u.cols ()); + double *Nptr = N.fortran_vec (); + +- if (! args(2).is_cell ()) ++ if (! args(2).iscell ()) + { + + double p = args(1).idx_type_value (); |