python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-05-29 02:03:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sane' of https://github.com/manisandro/Pillow into manisandro-sane

Browse Source
This commit is contained in:
Alex Clark 2014-03-17 08:46:16 -04:00
commit 3695d77c4d
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Sane/_sane.c
View File

@ -916,10 +916,13 @@ SaneDev_snap(SaneDevObject *self, PyObject *args)
call which returns SANE_STATUS_EOF in order to start call which returns SANE_STATUS_EOF in order to start
a new frame. a new frame.
*/ */
do { if (st != SANE_STATUS_EOF)
st = sane_read(self->h, buffer, READSIZE, &len); {
} do {
while (st == SANE_STATUS_GOOD); st = sane_read(self->h, buffer, READSIZE, &len);
}
while (st == SANE_STATUS_GOOD);
}
if (st != SANE_STATUS_EOF) if (st != SANE_STATUS_EOF)
{ {
Py_BLOCK_THREADS Py_BLOCK_THREADS
@ -937,10 +940,13 @@ SaneDev_snap(SaneDevObject *self, PyObject *args)
} }
} }
/* enforce SANE_STATUS_EOF. Can be necessary for ADF scans for some backends */ /* enforce SANE_STATUS_EOF. Can be necessary for ADF scans for some backends */
do { if (st != SANE_STATUS_EOF)
st = sane_read(self->h, buffer, READSIZE, &len); {
} do {
while (st == SANE_STATUS_GOOD); st = sane_read(self->h, buffer, READSIZE, &len);
}
while (st == SANE_STATUS_GOOD);
}
if (st != SANE_STATUS_EOF) if (st != SANE_STATUS_EOF)
{ {
sane_cancel(self->h); sane_cancel(self->h);