|
michael@24
|
1 |
Fix NDArray compilation/export
|
|
michael@24
|
2 |
|
|
michael@24
|
3 |
diff -r 8d405e2232b3 liboctave/ChangeLog
|
|
michael@24
|
4 |
--- a/liboctave/ChangeLog Thu Jul 17 11:19:39 2008 +0200
|
|
michael@24
|
5 |
+++ b/liboctave/ChangeLog Thu Jul 17 16:46:50 2008 +0200
|
|
michael@24
|
6 |
@@ -1,3 +1,8 @@
|
|
michael@24
|
7 |
+2008-07-17 Michael Goffioul <michael.goffioul@gmail.com>
|
|
michael@24
|
8 |
+
|
|
michael@24
|
9 |
+ * dNDArray.cc: Do not include ctor NDArray(Array<octave_idx_type>,
|
|
michael@24
|
10 |
+ bool, bool) into conditional HAVE_FFTW3 preprocessor statement.
|
|
michael@24
|
11 |
+
|
|
michael@24
|
12 |
2008-07-15 Michael Goffioul <michael.goffioul@gmail.com>
|
|
michael@24
|
13 |
|
|
michael@24
|
14 |
* oct-mutex.h, oct-mutex.cc: New files.
|
|
michael@24
|
15 |
diff -r 8d405e2232b3 liboctave/dNDArray.cc
|
|
michael@24
|
16 |
--- a/liboctave/dNDArray.cc Thu Jul 17 11:19:39 2008 +0200
|
|
michael@24
|
17 |
+++ b/liboctave/dNDArray.cc Thu Jul 17 16:46:50 2008 +0200
|
|
michael@24
|
18 |
@@ -40,6 +40,7 @@
|
|
michael@24
|
19 |
|
|
michael@24
|
20 |
#if defined (HAVE_FFTW3)
|
|
michael@24
|
21 |
#include "oct-fftw.h"
|
|
michael@24
|
22 |
+#endif
|
|
michael@24
|
23 |
|
|
michael@24
|
24 |
NDArray::NDArray (const Array<octave_idx_type>& a, bool zero_based,
|
|
michael@24
|
25 |
bool negative_to_nan)
|
|
michael@24
|
26 |
@@ -82,6 +83,8 @@
|
|
michael@24
|
27 |
ptmp[i] = static_cast<double> (pa[i]);
|
|
michael@24
|
28 |
}
|
|
michael@24
|
29 |
}
|
|
michael@24
|
30 |
+
|
|
michael@24
|
31 |
+#if defined (HAVE_FFTW3)
|
|
michael@24
|
32 |
|
|
michael@24
|
33 |
ComplexNDArray
|
|
michael@24
|
34 |
NDArray::fourier (int dim) const
|