Changeset 5897 for anuga_core/source/anuga/utilities/polygon_ext.c

Timestamp:

Nov 6, 2008, 12:17:15 PM (16 years ago)

Author:

ole

Message:

Reverted numpy changes to the trunk that should have been made to the branch.
The command was svn merge -r 5895:5890 .

File:

• anuga_core/source/anuga/utilities/polygon_ext.c (modified) (4 diffs)

anuga_core/source/anuga/utilities/polygon_ext.c

@@ -15 +15 @@
 
 #include "Python.h"
-#include "numpy/arrayobject.h"
+#include "Numeric/arrayobject.h"
 #include "math.h"
 
@@ -222 +222 @@
   }  
   for (k=0; k<M; k++) {
+    if (verbose){
+      if (k %((M+10)/10)==0) printf("Doing %d of %d\n", k, M);
+    }
+    
     x = points[2*k];
     y = points[2*k + 1];
 
-    if (verbose){
-      if (k %((M+10)/10)==0) printf("Doing %d of %d, x=%f, y=%f\n", k, M, x, y);
-    }
-    
     inside = 0;
 
@@ -376 +376 @@
     *polygon,
     *indices;
-//  PyObject *xxxx;
 
   int closed, verbose; //Flags
@@ -394 +393 @@
     return NULL;
   }
-  
-//  points = (PyArrayObject *) PyArray_ContiguousFromObject(xxxx, PyArray_DOUBLE, 1, 1);
 
   M = points -> dimensions[0];   //Number of points