arsenetar/dupeguru
1
0
Fork 0
mirror of https://github.com/arsenetar/dupeguru.git synced 2025-03-10 05:34:36 +00:00
Code Releases Wiki Activity

core_pe.modules.block: Converted inttuple() to a vararg based function.

Browse Source
This commit is contained in:
Virgil Dupras 2010-01-31 12:41:28 +01:00
parent 3d62a7e64a
commit 0e96f0917c
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
core_pe/modules/block.c
View File

@ -32,16 +32,18 @@ min(int a, int b)
/* Create a tuple out of an array of integers. */ /* Create a tuple out of an array of integers. */
static PyObject* static PyObject*
inttuple(int numbers[], int count) inttuple(int n, ...)
{ {
int i; int i;
PyObject *pnumber; PyObject *pnumber;
PyObject *result; PyObject *result;
va_list numbers;
result = PyTuple_New(count); va_start(numbers, n);
result = PyTuple_New(n);
for (i=0; i<count; i++) { for (i=0; i<n; i++) {
pnumber = PyInt_FromLong(numbers[i]); pnumber = PyInt_FromLong(va_arg(numbers, int));
if (pnumber == NULL) { if (pnumber == NULL) {
Py_DECREF(result); Py_DECREF(result);
return NULL; return NULL;
@ -49,6 +51,7 @@ inttuple(int numbers[], int count)
PyTuple_SET_ITEM(result, i, pnumber); PyTuple_SET_ITEM(result, i, pnumber);
} }
va_end(numbers);
return result; return result;
} }
@ -58,10 +61,11 @@ inttuple(int numbers[], int count)
static PyObject* static PyObject*
getblock(PyObject *image) getblock(PyObject *image)
{ {
int i, totals[3] = {0, 0, 0}; int i, totr, totg, totb;
Py_ssize_t pixel_count; Py_ssize_t pixel_count;
PyObject *ppixels; PyObject *ppixels;
totr = totg = totb = 0;
ppixels = PyObject_CallMethod(image, "getdata", NULL); ppixels = PyObject_CallMethod(image, "getdata", NULL);
if (ppixels == NULL) { if (ppixels == NULL) {
return NULL; return NULL;
@ -84,20 +88,20 @@ getblock(PyObject *image)
Py_DECREF(pg); Py_DECREF(pg);
Py_DECREF(pb); Py_DECREF(pb);
totals[0] += r; totr += r;
totals[1] += g; totg += g;
totals[2] += b; totb += b;
} }
Py_DECREF(ppixels); Py_DECREF(ppixels);
if (pixel_count) { if (pixel_count) {
totals[0] /= pixel_count; totr /= pixel_count;
totals[1] /= pixel_count; totg /= pixel_count;
totals[2] /= pixel_count; totb /= pixel_count;
} }
return inttuple(totals, 3); return inttuple(3, totr, totg, totb);
} }
/* Returns the difference between the first block and the second. /* Returns the difference between the first block and the second.
@ -178,7 +182,7 @@ block_getblocks2(PyObject *self, PyObject *args)
top = min(ih*block_height, height-block_height); top = min(ih*block_height, height-block_height);
bottom = top + block_height; bottom = top + block_height;
for (iw=0; iw<block_count_per_side; iw++) { for (iw=0; iw<block_count_per_side; iw++) {
int left, right, box[4]; int left, right;
PyObject *pbox; PyObject *pbox;
PyObject *pmethodname; PyObject *pmethodname;
PyObject *pcrop; PyObject *pcrop;
@ -186,11 +190,7 @@ block_getblocks2(PyObject *self, PyObject *args)
left = min(iw*block_width, width-block_width); left = min(iw*block_width, width-block_width);
right = left + block_width; right = left + block_width;
box[0] = left; pbox = inttuple(4, left, top, right, bottom);
box[1] = top;
box[2] = right;
box[3] = bottom;
pbox = inttuple(box, 4);
pmethodname = PyString_FromString("crop"); pmethodname = PyString_FromString("crop");
pcrop = PyObject_CallMethodObjArgs(image, pmethodname, pbox); pcrop = PyObject_CallMethodObjArgs(image, pmethodname, pbox);
Py_DECREF(pmethodname); Py_DECREF(pmethodname);