X-Git-Url: http://git.tomasm.cz/imago.git/blobdiff_plain/ad06aed1192f4b21ae009c593e8bf2ca5ed14fad..1f7946b6e18f2daeecbfc2b57a8b41a4d0747b30:/pcf.c?ds=inline

diff --git a/pcf.c b/pcf.c
index 4a14681..1682dbb 100644
--- a/pcf.c
+++ b/pcf.c
@@ -1,4 +1,99 @@
 #include <Python.h>
+#include <math.h>
+
+static PyObject* py_combine(PyObject* self, PyObject* args)
+{
+	const unsigned char *im_bg;
+	const unsigned char *im_fg;
+	int size;
+
+	int i;
+	long int sum;
+	int area;
+
+	if (!PyArg_ParseTuple(args, "s#s#", &im_bg, &size, &im_fg, &size)) return NULL;
+
+	sum = 0;
+	area = 0;
+	for (i=0; i < size; i++) {
+		if (im_fg[i]){
+			sum += im_bg[i];
+			area++;
+		}
+	}
+
+	return Py_BuildValue("d", ((double) sum) / area);
+}
+
+static PyObject* py_hough(PyObject* self, PyObject* args)
+{
+	const unsigned char *image;
+	int x;
+	int y;
+	int size;
+	double init_angle;
+	double dt;
+
+	int i;
+	int j;
+	int a;
+
+	double distance;
+	int column;
+	int minimum;
+	int maximum;
+
+	int *matrix;
+	unsigned char *n_image;
+	PyObject *result;
+
+	if (!PyArg_ParseTuple(args, "(ii)s#dd", &x, &y, &image, &size, &init_angle, &dt)) return NULL;
+	
+
+	matrix = (int*) malloc(size * sizeof(int));
+	for (i=0; i < x * y; i++) {
+		matrix[i] = 0;
+	}
+
+
+
+	for (i=0; i < x; i++) {
+		for (j=0; j < y; j++) {
+			if (image[j * x + i]){
+				for (a=0; a < y; a++){
+					distance = (((i - x / 2) * sin((dt * a) + init_angle)) +
+							((j - y / 2) * -cos((dt * a) + init_angle)) +
+							x / 2);
+					column = (int) round(distance);
+					if ((0 <= column) && (column < x)){
+						matrix[a * x + column]++;
+					}
+				}
+			}
+		}
+	}
+	
+
+
+
+	n_image = (char*) malloc(size * sizeof(char));
+	minimum = matrix[0];
+	maximum = matrix[0];
+	for (i=1; i < x * y; i++){
+		if (matrix[i] < minimum) minimum = matrix[i];
+		if (matrix[i] > maximum) maximum = matrix[i];
+	}
+	maximum = maximum - minimum + 1;
+	for (i=0; i < x * y; i++){
+		n_image[i] = (char) ((((float) (matrix[i] - minimum)) / maximum) * 256);
+	}
+
+	free(matrix);
+
+	result = Py_BuildValue("s#", n_image, size);
+	free(n_image);
+	return result;
+}
 
 static PyObject* py_edge(PyObject* self, PyObject* args)
 {
@@ -41,7 +136,7 @@ static PyObject* py_edge(PyObject* self, PyObject* args)
 				image[x * (j + 2) + i + 1] + image[x * (j + 2) + i + 2] +
 				image[x * (j + 1) + i - 2] + image[x * (j + 1) + i - 1] + image[x * (j + 1) + i] + 
 				image[x * (j + 1) + i + 1] + image[x * (j + 1) + i + 2] 
-				- (25 * image[x * j + i]);
+				- (24 * image[x * j + i]);
 			if (sum < 0) sum = 0;
 			if (sum > 255) sum = 255;
 			n_image[x * j + i] = sum;
@@ -57,7 +152,9 @@ static PyObject* py_edge(PyObject* self, PyObject* args)
 
 
 static PyMethodDef myModule_methods[] = {
+	{"combine", py_combine, METH_VARARGS},
 	{"edge", py_edge, METH_VARARGS},
+	{"hough", py_hough, METH_VARARGS},
 	{NULL, NULL}
 };