Mercurial > mxe-octave
changeset 5717:290b6f67946c
of-nurbs: update to v1.4.3
* src/of-nurbs.mk: update version, checksum
* src/of-nurbs-1-fixes.patch, src/of-nurbs-2-dev-fixes.patch: removed
* dist-files.mk: remove refs to deleted files
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Tue, 30 Mar 2021 18:57:15 -0400 |
parents | 7a2b72da91a7 |
children | 4f7224f631c3 |
files | dist-files.mk src/of-nurbs-1-fixes.patch src/of-nurbs-2-dev-fixes.patch src/of-nurbs.mk |
diffstat | 4 files changed, 2 insertions(+), 174 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Tue Mar 30 22:03:51 2021 +0200 +++ b/dist-files.mk Tue Mar 30 18:57:15 2021 -0400 @@ -500,8 +500,6 @@ of-miscellaneous.mk \ of-nan.mk \ of-netcdf.mk \ - of-nurbs-1-fixes.patch \ - of-nurbs-2-dev-fixes.patch \ of-nurbs.mk \ of-ocs-1-cross-fixes.patch \ of-ocs-2-dev-fixes.patch \
--- a/src/of-nurbs-1-fixes.patch Tue Mar 30 22:03:51 2021 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,90 +0,0 @@ -# HG changeset patch -# User John Donoghue -# Date 1443634028 14400 -# Wed Sep 30 13:27:08 2015 -0400 -# Node ID 41f9bc725e8fdc8d07efeedd09da84a013bb14c0 -# Parent fcd14dc97757ba4f3da5dbd4571b38a407235d2a -typecast constants to octave_idx_type (Bug #46081) - -* src/low_level_functions.cc: use octave_idx_type(0) for constant to idx_vector - -* src/nrb_srf_basisfun__.cc: use typecase octave_idx_type for constants - -* src/nrb_srf_basisfun_der__.cc: use typecase octave_idx_type for constants - -* src/nrbsurfderiveval.c: use use octave_idx_type(3) for constant to idx_vector - -diff -r fcd14dc97757 -r 41f9bc725e8f src/low_level_functions.cc ---- a/src/low_level_functions.cc Mon Sep 14 16:59:10 2015 +0100 -+++ b/src/low_level_functions.cc Wed Sep 30 13:27:08 2015 -0400 -@@ -306,7 +306,7 @@ - octave_idx_type dd = (d-k) <= dv ? (d-k) : dv; - Matrix temp (dd <= m ? (dd+1) : (m+1), m+1, 0.0); - -- idxva (0) = idx_vector(k); idxva (1) = idx_vector(0); -+ idxva (0) = idx_vector(k); idxva (1) = idx_vector(octave_idx_type(0)); - idxva (2) = idx_vector(i); idxva (3) = idx_vector(':'); - NDArray temp2 (pkl.index (idxva)); - curvederivcpts (m, q, V.extract (s1, V.numel () - 1), -diff -r fcd14dc97757 -r 41f9bc725e8f src/nrb_srf_basisfun__.cc ---- a/src/nrb_srf_basisfun__.cc Mon Sep 14 16:59:10 2015 +0100 -+++ b/src/nrb_srf_basisfun__.cc Wed Sep 30 13:27:08 2015 -0400 -@@ -40,10 +40,10 @@ - octave_idx_type q = static_cast<octave_idx_type> ((nrb.contents("order").vector_value())(1)) - 1; // q = nrb.order(2) -1; - - Array<idx_vector> idx(dim_vector (2, 1), idx_vector(':')); -- idx(0) = 0; -+ idx(0) = octave_idx_type(0); - const NDArray u(points.index (idx).squeeze ()); // u = points(1,:); - -- idx(0) = 1; -+ idx(0) = octave_idx_type(1); - const NDArray v(points.index (idx).squeeze ()); // v = points(2,:); - - octave_idx_type npt = u.numel (); // npt = length(u); -@@ -56,7 +56,7 @@ - - const RowVector V(knots(1).row_vector_value ()); // V = nrb.knots{2}; - -- Array<idx_vector> idx2(dim_vector (3, 1), idx_vector(':')); idx2(0) = 3; -+ Array<idx_vector> idx2(dim_vector (3, 1), idx_vector(':')); idx2(0) = octave_idx_type(3); - NDArray w (coefs.index (idx2).squeeze ()); // w = squeeze(nrb.coefs(4,:,:)); - - RowVector spu(u); -diff -r fcd14dc97757 -r 41f9bc725e8f src/nrb_srf_basisfun_der__.cc ---- a/src/nrb_srf_basisfun_der__.cc Mon Sep 14 16:59:10 2015 +0100 -+++ b/src/nrb_srf_basisfun_der__.cc Wed Sep 30 13:27:08 2015 -0400 -@@ -40,10 +40,10 @@ - octave_idx_type q = static_cast<octave_idx_type> ((nrb.contents("order").vector_value())(1)) - 1; // q = nrb.order(2) -1; - - Array<idx_vector> idx(dim_vector (2, 1), idx_vector(':')); -- idx(0) = 0; -+ idx(0) = octave_idx_type(0); - const NDArray u(points.index (idx).squeeze ()); // u = points(1,:); - -- idx(0) = 1; -+ idx(0) = octave_idx_type(1); - const NDArray v(points.index (idx).squeeze ()); // v = points(2,:); - - octave_idx_type npt = u.numel (); // npt = length(u); -@@ -63,7 +63,7 @@ - - const RowVector V(knots(1).row_vector_value ()); // V = nrb.knots{2}; - -- Array<idx_vector> idx2(dim_vector (3, 1), idx_vector(':')); idx2(0) = 3; -+ Array<idx_vector> idx2(dim_vector (3, 1), idx_vector(':')); idx2(0) = octave_idx_type(3); - NDArray w (coefs.index (idx2).squeeze ()); // w = squeeze(nrb.coefs(4,:,:)); - - RowVector spu(u); -diff -r fcd14dc97757 -r 41f9bc725e8f src/nrbsurfderiveval.cc ---- a/src/nrbsurfderiveval.cc Mon Sep 14 16:59:10 2015 +0100 -+++ b/src/nrbsurfderiveval.cc Wed Sep 30 13:27:08 2015 -0400 -@@ -119,7 +119,7 @@ - NDArray coefs = srf.contents("coefs").array_value(); - - Array<idx_vector> idx(dim_vector (3, 1), idx_vector(':')); -- idx (0) = idx_vector (3); -+ idx (0) = idx_vector (octave_idx_type(3)); - Matrix weights (NDArray (coefs.index (idx).squeeze ())); - - for (octave_idx_type iu(0); iu<uv.cols (); iu++)
--- a/src/of-nurbs-2-dev-fixes.patch Tue Mar 30 22:03:51 2021 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,80 +0,0 @@ -diff -ur nurbs-1.3.13.orig/src/bspeval.cc nurbs-1.3.13/src/bspeval.cc ---- nurbs-1.3.13.orig/src/bspeval.cc 2019-01-02 14:26:02.941385714 -0500 -+++ nurbs-1.3.13/src/bspeval.cc 2019-01-02 14:27:40.507737151 -0500 -@@ -113,7 +113,7 @@ - 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 -ur nurbs-1.3.13.orig/src/tbasisfun.cc nurbs-1.3.13/src/tbasisfun.cc ---- nurbs-1.3.13.orig/src/tbasisfun.cc 2019-01-02 14:26:02.941385714 -0500 -+++ nurbs-1.3.13/src/tbasisfun.cc 2019-01-02 14:27:54.744080103 -0500 -@@ -156,7 +156,7 @@ - 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 (); -diff -ur nurbs-1.3.13.orig/src/nrb_srf_basisfun__.cc nurbs-1.3.13/src/nrb_srf_basisfun__.cc ---- nurbs-1.3.13.orig/src/nrb_srf_basisfun__.cc 2019-01-02 14:34:00.900891192 -0500 -+++ nurbs-1.3.13/src/nrb_srf_basisfun__.cc 2019-01-02 14:34:46.781994244 -0500 -@@ -66,7 +66,7 @@ - } // 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 @@ - } // 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 -ur nurbs-1.3.13.orig/src/nrb_srf_basisfun_der__.cc nurbs-1.3.13/src/nrb_srf_basisfun_der__.cc ---- nurbs-1.3.13.orig/src/nrb_srf_basisfun_der__.cc 2019-01-02 14:34:00.900891192 -0500 -+++ nurbs-1.3.13/src/nrb_srf_basisfun_der__.cc 2019-01-02 14:35:50.667529890 -0500 -@@ -73,7 +73,7 @@ - } // 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 @@ - } // 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 @@ - - - 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++)
--- a/src/of-nurbs.mk Tue Mar 30 22:03:51 2021 +0200 +++ b/src/of-nurbs.mk Tue Mar 30 18:57:15 2021 -0400 @@ -3,8 +3,8 @@ PKG := of-nurbs $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.13 -$(PKG)_CHECKSUM := ae884f4edf4ee121928ff40e2e06372d2ef8f50a +$(PKG)_VERSION := 1.4.3 +$(PKG)_CHECKSUM := 8edd88cc9e6930704e4c98fb5c894ce302e342ce $(PKG)_REMOTE_SUBDIR := $(PKG)_SUBDIR := nurbs-$($(PKG)_VERSION) $(PKG)_FILE := nurbs-$($(PKG)_VERSION).tar.gz