kopia lustrzana https://gitlab.com/sane-project/backends
Misc fixes.
rodzic
86f399bd21
commit
df045634cb
|
@ -855,7 +855,6 @@ sane_read (SANE_Handle handle, SANE_Byte * buf, SANE_Int max_len,
|
||||||
}
|
}
|
||||||
|
|
||||||
DBG (DBG_DBG, "sane_read: Finish ReadScanedData\n");
|
DBG (DBG_DBG, "sane_read: Finish ReadScanedData\n");
|
||||||
s->bIsReading = SANE_FALSE;
|
|
||||||
s->scan_buf_len =
|
s->scan_buf_len =
|
||||||
image_row.wXferedLineNum * s->setpara.dwBytesPerRow;
|
image_row.wXferedLineNum * s->setpara.dwBytesPerRow;
|
||||||
DBG (DBG_INFO, "sane_read : s->scan_buf_len = %ld\n",
|
DBG (DBG_INFO, "sane_read : s->scan_buf_len = %ld\n",
|
||||||
|
@ -872,6 +871,7 @@ sane_read (SANE_Handle handle, SANE_Byte * buf, SANE_Int max_len,
|
||||||
free (tempbuf);
|
free (tempbuf);
|
||||||
s->scan_buf_start = s->scan_buf;
|
s->scan_buf_start = s->scan_buf;
|
||||||
s->read_rows -= image_row.wXferedLineNum;
|
s->read_rows -= image_row.wXferedLineNum;
|
||||||
|
s->bIsReading = SANE_FALSE;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -100,7 +100,7 @@ static pthread_t g_threadid_readimage;
|
||||||
static COLORMODE g_ScanMode;
|
static COLORMODE g_ScanMode;
|
||||||
static SCANSOURCE g_ssScanSource;
|
static SCANSOURCE g_ssScanSource;
|
||||||
|
|
||||||
ASIC g_chip;
|
static ASIC g_chip;
|
||||||
|
|
||||||
static int g_nSecLength, g_nDarkSecLength;
|
static int g_nSecLength, g_nDarkSecLength;
|
||||||
static int g_nSecNum, g_nDarkSecNum;
|
static int g_nSecNum, g_nDarkSecNum;
|
||||||
|
|
Ładowanie…
Reference in New Issue