Mercurial > mxe-octave

annotate src/of-nurbs-1-fixes.patch @ 3989:cdbce8086eaa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-ocs: new package * Makefile.in: add ocs to OCTAVE_FORGE_PACKAGES * build_packages.m: add ocs-0.1.4.tar.gz to install * dist-files.mk: add refs to of-ocs-1-cross-fixes.patch, of-ocs.mk * src/of-ocs-1-cross-fixes.patch: new file * src/of-ocs.mk: new file * index.html: add of-ocs
author John Donoghue <john.donoghue@ieee.org>
date Tue, 07 Jul 2015 20:43:46 -0400
parents 385f5f4412b7
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3903
385f5f4412b7 of-nurbs: fix cross compile, install libgomp's omp.h
John Donoghue
parents: 3899
diff changeset
1 diff -ur nurbs.orig/src/Makefile nurbs/src/Makefile
385f5f4412b7 of-nurbs: fix cross compile, install libgomp's omp.h
John Donoghue
parents: 3899
diff changeset
2 --- nurbs.orig/src/Makefile 2015-04-14 13:19:10.283611864 -0400
385f5f4412b7 of-nurbs: fix cross compile, install libgomp's omp.h
John Donoghue
parents: 3899
diff changeset
3 +++ nurbs/src/Makefile 2015-04-14 13:21:10.137011941 -0400
385f5f4412b7 of-nurbs: fix cross compile, install libgomp's omp.h
John Donoghue
parents: 3899
diff changeset
4 @@ -2,13 +2,15 @@
385f5f4412b7 of-nurbs: fix cross compile, install libgomp's omp.h
John Donoghue
parents: 3899
diff changeset
5 curvederivcpts.oct nrb_srf_basisfun_der__.oct surfderiveval.oct bspderiv.oct \
385f5f4412b7 of-nurbs: fix cross compile, install libgomp's omp.h
John Donoghue
parents: 3899
diff changeset
6 nrbsurfderiveval.oct tbasisfun.oct
385f5f4412b7 of-nurbs: fix cross compile, install libgomp's omp.h
John Donoghue
parents: 3899
diff changeset
7
385f5f4412b7 of-nurbs: fix cross compile, install libgomp's omp.h
John Donoghue
parents: 3899
diff changeset
8 +MKOCTFILE ?= mkoctfile
385f5f4412b7 of-nurbs: fix cross compile, install libgomp's omp.h
John Donoghue
parents: 3899
diff changeset
9 +
385f5f4412b7 of-nurbs: fix cross compile, install libgomp's omp.h
John Donoghue
parents: 3899
diff changeset
10 all: $(OCTFILES)
385f5f4412b7 of-nurbs: fix cross compile, install libgomp's omp.h
John Donoghue
parents: 3899
diff changeset
11
385f5f4412b7 of-nurbs: fix cross compile, install libgomp's omp.h
John Donoghue
parents: 3899
diff changeset
12 low_level_functions.o: low_level_functions.cc
385f5f4412b7 of-nurbs: fix cross compile, install libgomp's omp.h
John Donoghue
parents: 3899
diff changeset
13 - mkoctfile -c $<
385f5f4412b7 of-nurbs: fix cross compile, install libgomp's omp.h
John Donoghue
parents: 3899
diff changeset
14 + $(MKOCTFILE) -c $<
385f5f4412b7 of-nurbs: fix cross compile, install libgomp's omp.h
John Donoghue
parents: 3899
diff changeset
15
385f5f4412b7 of-nurbs: fix cross compile, install libgomp's omp.h
John Donoghue
parents: 3899
diff changeset
16 %.oct: %.cc low_level_functions.o
385f5f4412b7 of-nurbs: fix cross compile, install libgomp's omp.h
John Donoghue
parents: 3899
diff changeset
17 - mkoctfile $< low_level_functions.o
385f5f4412b7 of-nurbs: fix cross compile, install libgomp's omp.h
John Donoghue
parents: 3899
diff changeset
18 + $(MKOCTFILE) $< low_level_functions.o
385f5f4412b7 of-nurbs: fix cross compile, install libgomp's omp.h
John Donoghue
parents: 3899
diff changeset
19
385f5f4412b7 of-nurbs: fix cross compile, install libgomp's omp.h
John Donoghue
parents: 3899
diff changeset
20 clean:
385f5f4412b7 of-nurbs: fix cross compile, install libgomp's omp.h
John Donoghue
parents: 3899
diff changeset
21 -rm -f *.o core octave-core *.oct *~
3899
1778bfc775d2 Add nurbs package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
22 diff -ur nurbs.orig/src/nrbsurfderiveval.cc nurbs/src/nrbsurfderiveval.cc
3903
385f5f4412b7 of-nurbs: fix cross compile, install libgomp's omp.h
John Donoghue
parents: 3899
diff changeset
23 --- nurbs.orig/src/nrbsurfderiveval.cc 2015-04-14 13:19:10.283611864 -0400
385f5f4412b7 of-nurbs: fix cross compile, install libgomp's omp.h
John Donoghue
parents: 3899
diff changeset
24 +++ nurbs/src/nrbsurfderiveval.cc 2015-04-14 13:19:47.273352588 -0400
3899
1778bfc775d2 Add nurbs package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
25 @@ -120,7 +120,7 @@
1778bfc775d2 Add nurbs package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
26
1778bfc775d2 Add nurbs package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
27 Array<idx_vector> idx(dim_vector (3, 1), idx_vector(':'));
1778bfc775d2 Add nurbs package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
28 idx (0) = idx_vector (3);
1778bfc775d2 Add nurbs package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
29 - Matrix weights (NDArray (coefs.index (idx).squeeze ()).matrix_value ());
1778bfc775d2 Add nurbs package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
30 + Matrix weights (NDArray (coefs.index (idx).squeeze ()));
1778bfc775d2 Add nurbs package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
31
1778bfc775d2 Add nurbs package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
32 for (octave_idx_type iu(0); iu<uv.cols (); iu++)
1778bfc775d2 Add nurbs package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
33 {
1778bfc775d2 Add nurbs package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
34 @@ -132,7 +132,7 @@
1778bfc775d2 Add nurbs package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
35 {
1778bfc775d2 Add nurbs package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
36
1778bfc775d2 Add nurbs package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
37 Matrix Aders; idx(0) = idx_vector (idim);
1778bfc775d2 Add nurbs package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
38 - Matrix P (NDArray (coefs.index (idx).squeeze ()).matrix_value ());
1778bfc775d2 Add nurbs package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
39 + Matrix P (NDArray (coefs.index (idx).squeeze ()));
1778bfc775d2 Add nurbs package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
40 surfderiveval (n, p, knotsu, m, q, knotsv, P, uv(0,iu), uv(1,iu), d, Aders);;
1778bfc775d2 Add nurbs package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
41
1778bfc775d2 Add nurbs package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
42 for (octave_idx_type k(0); k<=d; k++)