gt68xx: Restore cancel "stop_scan" call and fix whitespace issue

The original issue that I had with this patch was in the cancel function
where the patch author had commented out the "stop scan" call for cancel.
This made no sense to me. I have put it back in for testing.
It might have been accidentally left out.
merge-requests/244/head
Ralph Little 2020-07-26 11:19:31 -07:00
rodzic 462419cc68
commit 5dd9eeb083
2 zmienionych plików z 5 dodań i 4 usunięć

Wyświetl plik

@ -2329,7 +2329,7 @@ sane_cancel (SANE_Handle handle)
/* some scanners don't like this command when cancelling a scan */
sanei_usb_set_timeout (SHORT_TIMEOUT);
gt68xx_device_fix_descriptor (s->dev);
//gt68xx_scanner_stop_scan (s);
gt68xx_scanner_stop_scan (s);
sanei_usb_set_timeout (LONG_TIMEOUT);
if (s->dev->model->flags & GT68XX_FLAG_SHEET_FED)
@ -2344,8 +2344,10 @@ sane_cancel (SANE_Handle handle)
gt68xx_device_carriage_home (s->dev);
}
if (s->gamma_table)
free (s->gamma_table);
s->gamma_table = 0;
{
free (s->gamma_table);
s->gamma_table = 0;
}
}
else
{

Wyświetl plik

@ -1161,7 +1161,6 @@ gt68xx_line_reader_free (GT68xx_Line_Reader * reader)
return SANE_STATUS_INVAL;
}
gt68xx_line_reader_free_delays (reader);
if (reader->pixel_buffer)