kopia lustrzana https://gitlab.com/sane-project/backends
backend/dc240.c - Batch scanning of multiple images with scanimage
was failing if subsequent images have a different size than from the first image.DEVEL_2_0_BRANCH-1
rodzic
d90edc34e2
commit
6410da5ee9
|
@ -623,8 +623,7 @@ read_data (SANE_Int fd, SANE_Byte * buf, SANE_Int sz)
|
||||||
{
|
{
|
||||||
DBG (2,
|
DBG (2,
|
||||||
"read_data: warning: "
|
"read_data: warning: "
|
||||||
"bad checksum (got %02x != expected %02x) will re-read block\n",
|
"bad checksum (got %02x != expected %02x)\n", rcsum, ccsum);
|
||||||
rcsum, ccsum);
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1403,6 +1402,12 @@ sane_read (SANE_Handle UNUSEDARG handle, SANE_Byte * data,
|
||||||
if (Camera.current_picture_number <= Camera.pic_taken)
|
if (Camera.current_picture_number <= Camera.pic_taken)
|
||||||
{
|
{
|
||||||
Camera.current_picture_number++;
|
Camera.current_picture_number++;
|
||||||
|
|
||||||
|
myinfo |= SANE_INFO_RELOAD_PARAMS;
|
||||||
|
|
||||||
|
/* get the image's resolution */
|
||||||
|
set_res (Camera.Pictures[Camera.current_picture_number - 1].
|
||||||
|
low_res);
|
||||||
}
|
}
|
||||||
DBG (4, "Increment count to %d (total %d)\n",
|
DBG (4, "Increment count to %d (total %d)\n",
|
||||||
Camera.current_picture_number, Camera.pic_taken);
|
Camera.current_picture_number, Camera.pic_taken);
|
||||||
|
|
Ładowanie…
Reference in New Issue