Changed setting of fortran-order array's flag; corrected documentaion

5 files changed, 7 insertions, 9 deletions

diff --git a/numpy/doc/swig/doc/numpy_swig.html b/numpy/doc/swig/doc/numpy_swig.html
index 514debe94..ded869ac9 100644
--- a/numpy/doc/swig/doc/numpy_swig.html
+++ b/numpy/doc/swig/doc/numpy_swig.html
@@ -5,7 +5,7 @@
 <meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" />
 <title>numpy.i: a SWIG Interface File for NumPy</title>
 <meta name="author" content="Bill Spotz" />
-<meta name="date" content="29 November, 2007" />
+<meta name="date" content="1 December, 2007" />
 <style type="text/css">
 
 /*
@@ -302,7 +302,7 @@ ul.auto-toc {
 <tr class="field"><th class="docinfo-name">Institution:</th><td class="field-body">Sandia National Laboratories</td>
 </tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>29 November, 2007</td></tr>
+<td>1 December, 2007</td></tr>
 </tbody>
 </table>
 <div class="contents topic">
@@ -702,8 +702,6 @@ typemap signatures are therefore</p>
 <ul class="simple">
 <li><tt class="docutils literal"><span class="pre">(</span> <span class="pre">DATA_TYPE**</span> <span class="pre">ARGOUTVIEW_ARRAY1,</span> <span class="pre">DIM_TYPE*</span> <span class="pre">DIM1</span> <span class="pre">)</span></tt></li>
 <li><tt class="docutils literal"><span class="pre">(</span> <span class="pre">DIM_TYPE*</span> <span class="pre">DIM1,</span> <span class="pre">DATA_TYPE**</span> <span class="pre">ARGOUTVIEW_ARRAY1</span> <span class="pre">)</span></tt></li>
-<li><tt class="docutils literal"><span class="pre">(</span> <span class="pre">DATA_TYPE**</span> <span class="pre">ARGOUTVIEW_FARRAY1,</span> <span class="pre">DIM_TYPE*</span> <span class="pre">DIM1</span> <span class="pre">)</span></tt></li>
-<li><tt class="docutils literal"><span class="pre">(</span> <span class="pre">DIM_TYPE*</span> <span class="pre">DIM1,</span> <span class="pre">DATA_TYPE**</span> <span class="pre">ARGOUTVIEW_FARRAY1</span> <span class="pre">)</span></tt></li>
 </ul>
 </blockquote>
 <p>2D:</p>
@@ -1236,7 +1234,7 @@ contributors has made this end result possible.</p>
 </div>
 <div class="footer">
 <hr class="footer" />
-Generated on: 2007-11-30 03:56 UTC.
+Generated on: 2007-12-01 18:08 UTC.
 Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
 
 </div>
diff --git a/numpy/doc/swig/doc/numpy_swig.pdf b/numpy/doc/swig/doc/numpy_swig.pdf
index b952628ae..2cfef5f2f 100644
--- a/numpy/doc/swig/doc/numpy_swig.pdf
+++ b/numpy/doc/swig/doc/numpy_swig.pdf
diff --git a/numpy/doc/swig/doc/numpy_swig.txt b/numpy/doc/swig/doc/numpy_swig.txt
index 603bbb46f..b589f2bf7 100644
--- a/numpy/doc/swig/doc/numpy_swig.txt
+++ b/numpy/doc/swig/doc/numpy_swig.txt
@@ -4,7 +4,7 @@
 
 :Author:      Bill Spotz
 :Institution: Sandia National Laboratories
-:Date:        29 November, 2007
+:Date:        1 December, 2007
 
 .. contents::
 
@@ -374,8 +374,6 @@ typemap signatures are therefore
 
   * ``( DATA_TYPE** ARGOUTVIEW_ARRAY1, DIM_TYPE* DIM1 )``
   * ``( DIM_TYPE* DIM1, DATA_TYPE** ARGOUTVIEW_ARRAY1 )``
-  * ``( DATA_TYPE** ARGOUTVIEW_FARRAY1, DIM_TYPE* DIM1 )``
-  * ``( DIM_TYPE* DIM1, DATA_TYPE** ARGOUTVIEW_FARRAY1 )``
 
 2D:
 
diff --git a/numpy/doc/swig/numpy.i b/numpy/doc/swig/numpy.i
index 981d9d3c3..cb1ae6338 100644
--- a/numpy/doc/swig/numpy.i
+++ b/numpy/doc/swig/numpy.i
@@ -61,6 +61,7 @@
 %#define NPY_MAX_INTP      MAX_INTP
 %#define NPY_MIN_INTP      MIN_INTP
 
+%#define NPY_FARRAY        FARRAY
 %#define NPY_F_CONTIGUOUS  F_CONTIGUOUS
 %#endif
 }
@@ -406,7 +407,7 @@
     int i;
     if (array_is_fortran(ary)) return success;
     /* Set the FORTRAN ordered flag */
-    ary->flags = ary->flags | NPY_F_CONTIGUOUS;
+    ary->flags = NPY_FARRAY;
     /* Recompute the strides */
     ary->strides[0] = ary->strides[nd-1];
     for (i=1; i < nd; ++i)
diff --git a/numpy/doc/swig/pyfragments.swg b/numpy/doc/swig/pyfragments.swg
index 00c68579a..6e812c647 100644
--- a/numpy/doc/swig/pyfragments.swg
+++ b/numpy/doc/swig/pyfragments.swg
@@ -57,6 +57,7 @@
 %#define NPY_MAX_INTP      MAX_INTP
 %#define NPY_MIN_INTP      MIN_INTP
 
+%#define NPY_FARRAY        FARRAY
 %#define NPY_F_CONTIGUOUS  F_CONTIGUOUS
 %#endif
 }