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

[#94 state:fixed] Fixed bug in block_osx causing blocks containing nil values to be created.

Browse Source
This commit is contained in:
Virgil Dupras 2010-02-10 11:58:05 +01:00
parent 1bedfe75ea
commit 626391a1d9
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
core_pe/modules/block_osx.m
View File

@ -150,7 +150,7 @@ static PyObject* block_osx_getblocks(PyObject *self, PyObject *args)
CGImageSourceRef source; CGImageSourceRef source;
CGImageRef image; CGImageRef image;
size_t width, height; size_t width, height;
int block_count, block_width, block_height, block_xcount, block_ycount, i; int block_count, block_width, block_height, i;
width = 0; width = 0;
height = 0; height = 0;
@ -192,23 +192,24 @@ static PyObject* block_osx_getblocks(PyObject *self, PyObject *args)
block_width = max(width/block_count, 1); block_width = max(width/block_count, 1);
block_height = max(height/block_count, 1); block_height = max(height/block_count, 1);
/* block_count might have changed */
block_xcount = (width / block_width);
block_ycount = (height / block_height);
result = PyList_New(block_xcount * block_ycount); result = PyList_New(block_count * block_count);
if (result == NULL) { if (result == NULL) {
return NULL; return NULL;
} }
for(i=0; i<block_ycount; i++) for(i=0; i<block_count; i++) {
{ int j, top;
int j; top = min(i*block_height, height-block_height);
for(j=0; j<block_xcount; j++) for(j=0; j<block_count; j++) {
{ int left;
PyObject *block = getblock(bitmapData, width, height, j*block_width, i*block_height, left = min(j*block_width, width-block_width);
block_width, block_height); PyObject *block = getblock(bitmapData, width, height, left, top, block_width, block_height);
PyList_SET_ITEM(result, i*block_ycount+j, block); if (block == NULL) {
Py_DECREF(result);
return NULL;
}
PyList_SET_ITEM(result, i*block_count+j, block);
} }
} }