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

[scipy-svn@scip...]

Author: tom.waite
Date: 2008-04-02 20:08:30 -0500 (Wed, 02 Apr 2008)
New Revision: 4072

Modified:
   trunk/scipy/ndimage/src/segment/Segmenter_EXT.c
Log:
added binary edge filter

Modified: trunk/scipy/ndimage/src/segment/Segmenter_EXT.c
===================================================================
--- trunk/scipy/ndimage/src/segment/Segmenter_EXT.c	2008-04-02 01:42:22 UTC (rev 4071)
+++ trunk/scipy/ndimage/src/segment/Segmenter_EXT.c	2008-04-03 01:08:30 UTC (rev 4072)
@@ -429,7 +429,40 @@
 }
 
 
+static PyObject *Segmenter_BinaryEdge(PyObject *self, PyObject *args)
+{
 
+    int num;
+    int nd;
+    int type;
+    npy_intp *dims;
+    unsigned short *mask_image;
+    unsigned short *edge_image;
+    PyObject  *mArray = NULL;
+    PyObject  *eArray = NULL;
+
+    if(!PyArg_ParseTuple(args, "OO", &mArray, &eArray)) 
+	    goto exit;
+
+    mask_image = (unsigned short *)PyArray_DATA(mArray);
+    nd   = PyArray_NDIM(mArray);
+    dims = PyArray_DIMS(mArray);
+    type = PyArray_TYPE(mArray);
+    num  = PyArray_SIZE(mArray);
+    edge_image = (unsigned short *)PyArray_DATA(eArray);
+
+    if(!PyArray_ISCONTIGUOUS(mArray))
+	    goto exit;
+
+    if(!NI_BinaryEdge(num, (int)dims[0], (int)dims[1], mask_image, edge_image))  
+	    goto exit;
+
+exit:
+
+    return PyErr_Occurred() ? NULL : (PyObject*)Py_BuildValue("");
+
+}
+
 static PyObject *Segmenter_LawsTextureMetric(PyObject *self, PyObject *args)
 {
 
@@ -513,6 +546,7 @@
 
 static PyMethodDef SegmenterMethods[] =
 {
+    { "binary_edge",          Segmenter_BinaryEdge,         METH_VARARGS, NULL },
     { "laws_texture_metric",  Segmenter_LawsTextureMetric,  METH_VARARGS, NULL },
     { "canny_hysteresis",     Segmenter_CannyHysteresis,    METH_VARARGS, NULL },
     { "canny_nonmax_supress", Segmenter_CannyNonMaxSupress, METH_VARARGS, NULL },