summaryrefslogtreecommitdiff
path: root/backend/artec_eplus48u.c
diff options
context:
space:
mode:
Diffstat (limited to 'backend/artec_eplus48u.c')
-rw-r--r--backend/artec_eplus48u.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/backend/artec_eplus48u.c b/backend/artec_eplus48u.c
index f31bf5c..c5eb225 100644
--- a/backend/artec_eplus48u.c
+++ b/backend/artec_eplus48u.c
@@ -2956,7 +2956,7 @@ init_options (Artec48U_Scanner * s)
SANE_I18N ("If enabled, only the shading correction is "
"performed during calibration. The default values "
"for gain, offset and exposure time, "
- "either build-in or from the configuration file, "
+ "either built-in or from the configuration file, "
"are used.");
s->opt[OPT_CALIBRATE_SHADING].type = SANE_TYPE_BOOL;
s->opt[OPT_CALIBRATE_SHADING].unit = SANE_UNIT_NONE;
@@ -3505,7 +3505,7 @@ do_cancel (Artec48U_Scanner * s, SANE_Bool closepipe)
{
XDBG ((1, "sanei_thread_waitpid() failed !\n"));
}
- s->reader_pid = -1;
+ sanei_thread_invalidate (s->reader_pid);
XDBG ((1, "reader_process killed\n"));
}
if (SANE_TRUE == closepipe)
@@ -4337,7 +4337,7 @@ sane_read (SANE_Handle handle, SANE_Byte * data,
if (s->eof == SANE_TRUE)
{
sanei_thread_waitpid (s->reader_pid, 0);
- s->reader_pid = -1;
+ sanei_thread_invalidate (s->reader_pid);
artec48u_scanner_stop_scan (s);
artec48u_carriage_home (s->dev);
return close_pipe (s);