summaryrefslogtreecommitdiff
path: root/backend/gt68xx.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2020-08-24 18:45:34 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2020-08-24 18:45:34 +0200
commit2b3e02411ecc09e7d41741b5587655c9b2f955b7 (patch)
treed839746371ecb8ed64ac81d2e37c11fcd25a00ac /backend/gt68xx.c
parent787fb1d54ec9ee5fb941ae897fb201feb9cb2fd1 (diff)
parentad38bc6ecb80ddeb562841b33258dd53659b1da6 (diff)
Update upstream source from tag 'upstream/1.0.31'
Update to upstream version '1.0.31' with Debian dir aa7a39fe56343f5e164eec83783f4c923a394865
Diffstat (limited to 'backend/gt68xx.c')
-rw-r--r--backend/gt68xx.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/backend/gt68xx.c b/backend/gt68xx.c
index 00190fe..f657d42 100644
--- a/backend/gt68xx.c
+++ b/backend/gt68xx.c
@@ -2130,6 +2130,7 @@ sane_read (SANE_Handle handle, SANE_Byte * buf, SANE_Int max_len,
&& s->byte_count >= s->reader->params.pixel_xs)
{
DBG (4, "sane_read: nothing more to scan: EOF\n");
+ gt68xx_scanner_stop_scan(s);
return SANE_STATUS_EOF;
}
@@ -2343,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
{