[Scipy-svn] r4085 - trunk/scipy/ndimage/src/segment

[scipy-svn@scip...]

Author: tom.waite
Date: 2008-04-06 13:27:20 -0500 (Sun, 06 Apr 2008)
New Revision: 4085

Modified:
   trunk/scipy/ndimage/src/segment/Segmenter_EXT.c
Log:
added co-occurence matrix feature vector

Modified: trunk/scipy/ndimage/src/segment/Segmenter_EXT.c
===================================================================
--- trunk/scipy/ndimage/src/segment/Segmenter_EXT.c	2008-04-05 18:16:14 UTC (rev 4084)
+++ trunk/scipy/ndimage/src/segment/Segmenter_EXT.c	2008-04-06 18:27:20 UTC (rev 4085)
@@ -549,8 +549,9 @@
     int nd;
     int type;
     int distance;
+    int orientation;
     npy_intp *dims;
-    npy_intp *dims_coc;
+    npy_intp *dims_cocm;
     unsigned short *mask_image;
     unsigned short *raw_image;
     int *coc_matrix;
@@ -558,7 +559,7 @@
     PyObject *rArray = NULL;
     PyObject *cArray = NULL;
 
-    if(!PyArg_ParseTuple(args, "OOOi", &mArray, &rArray, &cArray, &distance)) 
+    if(!PyArg_ParseTuple(args, "OOOii", &mArray, &rArray, &cArray, &distance, &orientation)) 
 	    goto exit;
 
     mask_image = (unsigned short *)PyArray_DATA(mArray);
@@ -568,10 +569,10 @@
     num  = PyArray_SIZE(mArray);
     raw_image  = (unsigned short *)PyArray_DATA(rArray);
     coc_matrix = (int *)PyArray_DATA(cArray);
-    dims_coc = PyArray_DIMS(cArray);
+    dims_cocm  = PyArray_DIMS(cArray);
 
     if(!NI_RoiCoOccurence(num, (int)dims[0], (int)dims[1], mask_image, raw_image,
-			  coc_matrix, distance))  
+			  coc_matrix, distance, orientation))  
 	    goto exit;