Update upstream source from tag 'upstream/1.0.32'

Update to upstream version '1.0.32'
with Debian dir 2c1111c59d9d68bcbf479a4a4de7697fe2de127f

20 files changed, 93 insertions, 88 deletions

diff --git a/include/sane/sane.h b/include/sane/sane.h
index 9f8bc7c..494ee89 100644
--- a/include/sane/sane.h
+++ b/include/sane/sane.h
@@ -70,7 +70,7 @@ typedef enum
   }
 SANE_Status;
 
-/* following are for later sane version, older frontends wont support */
+/* following are for later sane version, older frontends won't support */
 #if 0
 #define SANE_STATUS_WARMING_UP 12 /* lamp not ready, please retry */
 #define SANE_STATUS_HW_LOCKED  13 /* scanner mechanism locked for transport */
diff --git a/include/sane/sanei.h b/include/sane/sanei.h
index 7513d22..6f83776 100644
--- a/include/sane/sanei.h
+++ b/include/sane/sanei.h
@@ -15,8 +15,8 @@
    License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with sane; see the file COPYING.  If not, write to the Free
-   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with sane; see the file COPYING.
+   If not, see <https://www.gnu.org/licenses/>.
 
    As a special exception, the authors of SANE give permission for
    additional uses of the libraries contained in this release of SANE.
@@ -118,7 +118,7 @@ extern "C" {
  * @return
  * - SANE_STATUS_GOOD     - on success
  * - SANE_STATUS_INVAL    - if the value doesn't fit inside the constraint
- *   or any other error occured
+ *   or any other error occurred
  * @sa sanei_constrain_value()
  */
 
@@ -135,7 +135,7 @@ extern "C" {
  * @return
  * - SANE_STATUS_GOOD     - on success
  * - SANE_STATUS_INVAL    - if the function wasn't able to fit value into the
- *   constraint or any other error occured
+ *   constraint or any other error occurred
  * @sa sanei_check_value()
  */
 
diff --git a/include/sane/sanei_ab306.h b/include/sane/sanei_ab306.h
index dacfd84..97885c5 100644
--- a/include/sane/sanei_ab306.h
+++ b/include/sane/sanei_ab306.h
@@ -13,9 +13,7 @@
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
    As a special exception, the authors of SANE give permission for
    additional uses of the libraries contained in this release of SANE.
diff --git a/include/sane/sanei_access.h b/include/sane/sanei_access.h
index 0f73f5f..36aef7f 100644
--- a/include/sane/sanei_access.h
+++ b/include/sane/sanei_access.h
@@ -15,9 +15,7 @@
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
    As a special exception, the authors of SANE give permission for
    additional uses of the libraries contained in this release of SANE.
@@ -45,7 +43,7 @@
 /** @file sanei_access.h
  *  Interface file for the sanei_access functions.
  *
- *  The idea is to provide some simple locking/unlocking mecanism, which
+ *  The idea is to provide some simple locking/unlocking mechanism, which
  *  can be used to protect device access from more than one frontend
  *  simultaneously.
  */
diff --git a/include/sane/sanei_auth.h b/include/sane/sanei_auth.h
index 37c8d1f..64b0c7d 100644
--- a/include/sane/sanei_auth.h
+++ b/include/sane/sanei_auth.h
@@ -13,9 +13,7 @@
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
    As a special exception, the authors of SANE give permission for
    additional uses of the libraries contained in this release of SANE.
diff --git a/include/sane/sanei_codec_ascii.h b/include/sane/sanei_codec_ascii.h
index 991499a..52bf88f 100644
--- a/include/sane/sanei_codec_ascii.h
+++ b/include/sane/sanei_codec_ascii.h
@@ -13,8 +13,8 @@
    for more details.
 
    You should have received a copy of the GNU General Public License
-   along with sane; see the file COPYING.  If not, write to the Free
-   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with sane; see the file COPYING.
+   If not, see <https://www.gnu.org/licenses/>.
 
    As a special exception, the authors of SANE give permission for
    additional uses of the libraries contained in this release of SANE.
diff --git a/include/sane/sanei_codec_bin.h b/include/sane/sanei_codec_bin.h
index ba17bac..ff196da 100644
--- a/include/sane/sanei_codec_bin.h
+++ b/include/sane/sanei_codec_bin.h
@@ -13,8 +13,8 @@
    for more details.
 
    You should have received a copy of the GNU General Public License
-   along with sane; see the file COPYING.  If not, write to the Free
-   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with sane; see the file COPYING.
+   If not, see <https://www.gnu.org/licenses/>.
 
    As a special exception, the authors of SANE give permission for
    additional uses of the libraries contained in this release of SANE.
diff --git a/include/sane/sanei_config.h b/include/sane/sanei_config.h
index 3a60167..ed2de6f 100644
--- a/include/sane/sanei_config.h
+++ b/include/sane/sanei_config.h
@@ -13,9 +13,7 @@
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
    As a special exception, the authors of SANE give permission for
    additional uses of the libraries contained in this release of SANE.
@@ -166,7 +164,9 @@ typedef struct
 extern SANE_Status sanei_configure_attach (
   const char *config_file,
   SANEI_Config *config,
-  SANE_Status (*config_attach)(SANEI_Config *config, const char *devname)
+  SANE_Status (*config_attach)(SANEI_Config *config, const char *devname,
+                               void *data),
+  void *data
 );
 
 /** Return the list of config directories, extracted from the SANE_CONFIG_DIR
diff --git a/include/sane/sanei_ir.h b/include/sane/sanei_ir.h
index bbfd6d5..da70f40 100644
--- a/include/sane/sanei_ir.h
+++ b/include/sane/sanei_ir.h
@@ -12,7 +12,7 @@
  * - 2) find the dirt
  * - 3) replace the dirt
  *
- * - 1) is mainly adressed by sanei_ir_spectral_clean
+ * - 1) is mainly addressed by sanei_ir_spectral_clean
  * - 2) by sanei_ir_filter_madmean
  * - 3) by sanei_ir_dilate_mean
  */
@@ -185,7 +185,7 @@ sanei_ir_to_8bit (SANE_Parameters * params, const SANE_Uint *in_img,
  * @brief Allocate and initialize logarithmic lookup table
  *
  * @param[in]  len length of table, usually 1 << depth
- * @param[out] lut_ln adress of pointer to allocated table
+ * @param[out] lut_ln address of pointer to allocated table
  *
  * @return
  * - SANE_STATUS_GOOD - success
@@ -208,9 +208,9 @@ SANE_Status sanei_ir_ln_table (int len, double **lut_ln);
  * - SANE_STATUS_GOOD - success
  * - SANE_STATUS_NO_MEM - if out of memory
  *
- * This routine is based on the observation that the relation beween the infrared value
+ * This routine is based on the observation that the relation between the infrared value
  * ired and the red value red of an image point can be described by ired = b + a * ln (red).
- * First points are randomly sampled to calculate the linear regression coefficent a.
+ * First points are randomly sampled to calculate the linear regression coefficient a.
  * Then ired' = ired - a  * ln (red) is calculated for each pixel. Finally, the ir' image
  * is scaled between 0 and maximal value. For the logarithms a lookup table is used.
  * Negative films show very little spectral overlap but positive film usually has to be
@@ -255,8 +255,8 @@ sanei_ir_filter_mean (const SANE_Parameters * params,
  * @param[in]  in_img pointer to grey scale image
  * @param[out] out_img address of pointer to newly allocated binary image
  * @param[in] win_size Size of filtering window
- * @param[in]  a_val Parameter, below is definetly clean
- * @param[in]  b_val Parameter, above is definetly noisy
+ * @param[in]  a_val Parameter, below is definitely clean
+ * @param[in]  b_val Parameter, above is definitely noisy
  *
  * @return
  * - SANE_STATUS_GOOD - success
@@ -267,7 +267,7 @@ sanei_ir_filter_mean (const SANE_Parameters * params,
  * The dirty pixels which we wish to remove are always darker than the real signal. But
  * at high resolutions the scanner may generate some noise and the ired cleaning step can
  * reverse things. So a maximum filter will not do.
- * The second median is replaced by a mean filter to reduce computation time. Inspite of
+ * The second median is replaced by a mean filter to reduce computation time. In spite of
  * these changes Crnojevic's recommendations for the choice of the parameters "a" and "b"
  * are still valid when scaled to the color depth.
  *
diff --git a/include/sane/sanei_lm983x.h b/include/sane/sanei_lm983x.h
index 8b48e65..9c075fd 100644
--- a/include/sane/sanei_lm983x.h
+++ b/include/sane/sanei_lm983x.h
@@ -16,9 +16,7 @@
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
    As a special exception, the authors of SANE give permission for
    additional uses of the libraries contained in this release of SANE.
@@ -141,7 +139,7 @@ extern SANE_Status sanei_lm983x_read( SANE_Int fd, SANE_Byte reg,
  *
  * @param fd    - device file descriptor
  * @return
- * - SANE_TRUE  - reset successfuly done
+ * - SANE_TRUE  - reset successfully done
  * - SANE_FALSE - reset failed
  */
 extern SANE_Bool sanei_lm983x_reset( SANE_Int fd );
diff --git a/include/sane/sanei_magic.h b/include/sane/sanei_magic.h
index 297becd..c7ec83c 100644
--- a/include/sane/sanei_magic.h
+++ b/include/sane/sanei_magic.h
@@ -15,8 +15,8 @@
    License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with sane; see the file COPYING.  If not, write to the Free
-   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with sane; see the file COPYING.
+   If not, see <https://www.gnu.org/licenses/>.
 
    As a special exception, the authors of SANE give permission for
    additional uses of the libraries contained in this release of SANE.
diff --git a/include/sane/sanei_pa4s2.h b/include/sane/sanei_pa4s2.h
index 7138ceb..591ddd8 100644
--- a/include/sane/sanei_pa4s2.h
+++ b/include/sane/sanei_pa4s2.h
@@ -13,9 +13,7 @@
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
    As a special exception, the authors of SANE give permission for
    additional uses of the libraries contained in this release of SANE.
@@ -54,7 +52,7 @@
 /** @name Options to control interface operations */
 /* @{ */
 #define SANEI_PA4S2_OPT_DEFAULT		0	/* normal mode */
-#define SANEI_PA4S2_OPT_TRY_MODE_UNI	1	/* enable UNI protocoll */
+#define SANEI_PA4S2_OPT_TRY_MODE_UNI	1	/* enable UNI protocol */
 #define SANEI_PA4S2_OPT_ALT_LOCK	2	/* use alternative lock cmd */
 #define SANEI_PA4S2_OPT_NO_EPP		4	/* do not try to use EPP */
 /* @} */
diff --git a/include/sane/sanei_pio.h b/include/sane/sanei_pio.h
index afdfa26..ec1f3de 100644
--- a/include/sane/sanei_pio.h
+++ b/include/sane/sanei_pio.h
@@ -14,9 +14,7 @@
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
    As a special exception, the authors of SANE give permission for
    additional uses of the libraries contained in this release of SANE.
diff --git a/include/sane/sanei_pp.h b/include/sane/sanei_pp.h
index 902fcfa..3fe8e0d 100644
--- a/include/sane/sanei_pp.h
+++ b/include/sane/sanei_pp.h
@@ -13,9 +13,7 @@
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
    As a special exception, the authors of SANE give permission for
    additional uses of the libraries contained in this release of SANE.
@@ -161,7 +159,7 @@ extern SANE_Byte sanei_pp_inb_ctrl( int fd );
 extern SANE_Byte sanei_pp_inb_epp ( int fd );
 
 /** Delay execution for some micro-seconds.
- *  Please not, that the accuracy highly depends on your system architechture
+ *  Please note, that the accuracy highly depends on your system architecture
  *  and the time to delay. It is internally implemented as system calls to
  *  gettimeofday().
  *
diff --git a/include/sane/sanei_pv8630.h b/include/sane/sanei_pv8630.h
index d69a024..c3bdece 100644
--- a/include/sane/sanei_pv8630.h
+++ b/include/sane/sanei_pv8630.h
@@ -17,9 +17,7 @@
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
    As a special exception, the authors of SANE give permission for
    additional uses of the libraries contained in this release of SANE.
diff --git a/include/sane/sanei_scsi.h b/include/sane/sanei_scsi.h
index fa6e5d1..d9e0f8a 100644
--- a/include/sane/sanei_scsi.h
+++ b/include/sane/sanei_scsi.h
@@ -13,8 +13,8 @@
    License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with sane; see the file COPYING.  If not, write to the Free
-   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with sane; see the file COPYING.
+   If not, see <https://www.gnu.org/licenses/>.
 
    As a special exception, the authors of SANE give permission for
    additional uses of the libraries contained in this release of SANE.
@@ -113,7 +113,7 @@ extern void sanei_scsi_find_devices (const char *vendor, const char *model,
  * - SANE_STATUS_ACCESS_DENIED - if the file couldn't be accessed due to
  *   permissions
  * - SANE_STATUS_NO_MEM - if malloc failed (not enough memory)
- * - SANE_STATUS_INVAL - if the filename was invalid or an unknown error occured
+ * - SANE_STATUS_INVAL - if the filename was invalid or an unknown error occurred
  *
  * @sa sanei_scsi_open_extended(), HAVE_SANEI_SCSI_OPEN_EXTENDED
  */
@@ -144,7 +144,7 @@ extern SANE_Status sanei_scsi_open (const char * device_name, int * fd,
  * - SANE_STATUS_ACCESS_DENIED - if the file couldn't be accessed due to
  *   permissions
  * - SANE_STATUS_NO_MEM - if malloc failed (not enough memory)
- * - SANE_STATUS_INVAL - if the filename was invalid or an unknown error occured
+ * - SANE_STATUS_INVAL - if the filename was invalid or an unknown error occurred
  *
  * @sa sanei_scsi_open(), HAVE_SANEI_SCSI_OPEN_EXTENDED
  */
@@ -186,7 +186,7 @@ extern SANE_Status sanei_scsi_open_extended (
  * - SANE_STATUS_GOOD - on success
  * - SANE_STATUS_IO_ERROR - if an error was received from the SCSI driver
  * - SANE_STATUS_NO_MEM - if malloc failed (not enough memory)
- * - SANE_STATUS_INVAL - if a locking or an unknown error occured
+ * - SANE_STATUS_INVAL - if a locking or an unknown error occurred
  * @sa sanei_scsi_req_enter2()
  *
 */
@@ -200,7 +200,7 @@ extern SANE_Status sanei_scsi_req_enter (int fd,
  * Same as sanei_scsi_req_enter(), but with separate buffers for the SCSI
  * command and for the data to be sent to the device.
  *
- * With sanei_scsi_req_enter(), the length of te SCSI command block must be
+ * With sanei_scsi_req_enter(), the length of the SCSI command block must be
  * guessed. While that works in most cases, Canon scanners for example use the
  * vendor specific commands 0xd4, 0xd5 and 0xd6. The Canon scanners want to
  * get 6 byte command blocks for these commands, but sanei_scsi_req_enter() and
@@ -224,7 +224,7 @@ extern SANE_Status sanei_scsi_req_enter (int fd,
  * - SANE_STATUS_GOOD - on success
  * - SANE_STATUS_IO_ERROR - if an error was received from the SCSI driver
  * - SANE_STATUS_NO_MEM - if malloc failed (not enough memory)
- * - SANE_STATUS_INVAL - if a locking or an unknown error occured
+ * - SANE_STATUS_INVAL - if a locking or an unknown error occurred
  * @sa sanei_scsi_req_enter()
  */
 extern SANE_Status sanei_scsi_req_enter2 (int fd,
@@ -264,7 +264,7 @@ extern SANE_Status sanei_scsi_req_wait (void *id);
  * - SANE_STATUS_GOOD - on success
  * - SANE_STATUS_IO_ERROR - if an error was received from the SCSI driver
  * - SANE_STATUS_NO_MEM - if malloc failed (not enough memory)
- * - SANE_STATUS_INVAL - if a locking or an unknown error occured
+ * - SANE_STATUS_INVAL - if a locking or an unknown error occurred
  *
  * @sa sanei_scsi_cmd2(), sanei_scsi_req_enter(), sanei_scsi_req_wait()
  */
@@ -291,7 +291,7 @@ extern SANE_Status sanei_scsi_cmd (int fd,
  * - SANE_STATUS_GOOD - on success
  * - SANE_STATUS_IO_ERROR - if an error was received from the SCSI driver
  * - SANE_STATUS_NO_MEM - if malloc failed (not enough memory)
- * - SANE_STATUS_INVAL - if a locking or an unknown error occured
+ * - SANE_STATUS_INVAL - if a locking or an unknown error occurred
  *
  * @sa sanei_scsi_cmd(), sanei_scsi_req_enter(), sanei_scsi_req_wait()
  */
diff --git a/include/sane/sanei_thread.h b/include/sane/sanei_thread.h
index 6e68964..72fd8fd 100644
--- a/include/sane/sanei_thread.h
+++ b/include/sane/sanei_thread.h
@@ -15,8 +15,8 @@
    for more details.
 
    You should have received a copy of the GNU General Public License
-   along with sane; see the file COPYING.  If not, write to the Free
-   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with sane; see the file COPYING.
+   If not, see <https://www.gnu.org/licenses/>.
 
    As a special exception, the authors of SANE give permission for
    additional uses of the libraries contained in this release of SANE.
@@ -101,7 +101,7 @@ extern SANE_Bool sanei_thread_is_valid (SANE_Pid pid);
  *
  *  @note
  *  When using pthreads, this only works for those implementations
- *  that opted to make pthread_t an arithmatic type.  This is *not*
+ *  that opted to make pthread_t an arithmetic type.  This is *not*
  *  required by the POSIX threads specification.  The choice to do
  *  SANE_Pid invalidation by means of a macro rather than a proper
  *  function circumvents to need to pass a pointer.
@@ -150,7 +150,7 @@ extern SANE_Pid sanei_thread_begin (int (*func) (void *args), void *args);
  *
  * @return
  * - 0 on success
- * - any other value if an error occured while terminating the task
+ * - any other value if an error occurred while terminating the task
  */
 extern int sanei_thread_kill (SANE_Pid pid);
 
@@ -165,7 +165,7 @@ extern int sanei_thread_kill (SANE_Pid pid);
  *
  * @return
  * - 0 - on success
- * - any other value - if an error occured while sending the signal
+ * - any other value - if an error occurred while sending the signal
  */
 extern int sanei_thread_sendsig (SANE_Pid pid, int sig);
 
diff --git a/include/sane/sanei_usb.h b/include/sane/sanei_usb.h
index 1c1699d..81032db 100644
--- a/include/sane/sanei_usb.h
+++ b/include/sane/sanei_usb.h
@@ -16,8 +16,8 @@
    License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with sane; see the file COPYING.  If not, write to the Free
-   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with sane; see the file COPYING.
+   If not, see <https://www.gnu.org/licenses/>.
 
    As a special exception, the authors of SANE give permission for
    additional uses of the libraries contained in this release of SANE.
@@ -186,7 +186,7 @@ struct sanei_usb_dev_descriptor
     must be called before sanei_usb_init().
 
     The sanei_usb subsystem also implements a "development mode". It modifies
-    the XML data file with the actual commands of the test run and attemps to
+    the XML data file with the actual commands of the test run and attempts to
     proceed testing until a mismatching input command is found for which
     input data is required.
 
@@ -224,6 +224,19 @@ extern SANE_String sanei_usb_testing_get_backend();
  */
 extern SANE_Bool sanei_usb_is_replay_mode_enabled();
 
+/** Clears currently recorded data.
+
+    This is useful on certain backends to clear the currently recorded data if it relates to
+    other devices than the one that the scan will be performed on. On these backends all
+    devices that the backend supports are opened multiple times. Recording this interaction
+    to XML file makes it impossible to replay it, as the existence of these devices is not mocked
+    currently.
+
+    This function may only be called when no USB devices are open, otherwise the behavior is
+    unpredictable.
+ */
+extern void sanei_usb_testing_record_clear();
+
 /** Records a debug message in the captured USB data if testing mode is enabled. If testing mode
  * is not enabled, this function does nothing.
  *
@@ -246,7 +259,7 @@ extern void sanei_usb_exit (void);
 
 /** Search for USB devices.
  *
- * Search USB busses for scanner devices.
+ * Search USB buses for scanner devices.
  */
 extern void sanei_usb_scan_devices (void);
 
@@ -390,9 +403,9 @@ extern SANE_Status sanei_usb_reset (SANE_Int dn);
  * @param size size of the data
  *
  * @return
- * - SANE_STATUS_GOOD - on succes
+ * - SANE_STATUS_GOOD - on success
  * - SANE_STATUS_EOF - if zero bytes have been read
- * - SANE_STATUS_IO_ERROR - if an error occured during the read
+ * - SANE_STATUS_IO_ERROR - if an error occurred during the read
  * - SANE_STATUS_INVAL - on every other error
  *
  */
@@ -409,8 +422,8 @@ sanei_usb_read_bulk (SANE_Int dn, SANE_Byte * buffer, size_t * size);
  * @param size size of the data
  *
  * @return
- * - SANE_STATUS_GOOD - on succes
- * - SANE_STATUS_IO_ERROR - if an error occured during the write
+ * - SANE_STATUS_GOOD - on success
+ * - SANE_STATUS_IO_ERROR - if an error occurred during the write
  * - SANE_STATUS_INVAL - on every other error
  */
 extern SANE_Status
@@ -418,7 +431,7 @@ sanei_usb_write_bulk (SANE_Int dn, const SANE_Byte * buffer, size_t * size);
 
 /** Send/receive a control message to/from a USB device.
  *
- * This function is only supported for libusb devices and kernel acces with
+ * This function is only supported for libusb devices and kernel access with
  * Linux 2.4.13 and newer.
  * For a detailed explanation of the parameters, have a look at the USB
  * specification at the <a href="http://www.usb.org/developers/docs/">
@@ -455,9 +468,9 @@ sanei_usb_control_msg (SANE_Int dn, SANE_Int rtype, SANE_Int req,
  * @param size size of the data
  *
  * @return
- * - SANE_STATUS_GOOD - on succes
+ * - SANE_STATUS_GOOD - on success
  * - SANE_STATUS_EOF - if zero bytes have been read
- * - SANE_STATUS_IO_ERROR - if an error occured during the read
+ * - SANE_STATUS_IO_ERROR - if an error occurred during the read
  * - SANE_STATUS_INVAL - on every other error
  *
  */
@@ -493,9 +506,9 @@ sanei_usb_attach_matching_devices (const char *name,
  * @param configuration, configuration nummber
  *
  * @return
- * - SANE_STATUS_GOOD - on succes
+ * - SANE_STATUS_GOOD - on success
  * - SANE_STATUS_EOF - if zero bytes have been read
- * - SANE_STATUS_IO_ERROR - if an error occured during the read
+ * - SANE_STATUS_IO_ERROR - if an error occurred during the read
  * - SANE_STATUS_INVAL - on every other error
  *
  */
@@ -511,9 +524,9 @@ sanei_usb_set_configuration (SANE_Int dn, SANE_Int configuration);
  * @param interface_number interface number
  *
  * @return
- * - SANE_STATUS_GOOD - on succes
+ * - SANE_STATUS_GOOD - on success
  * - SANE_STATUS_EOF - if zero bytes have been read
- * - SANE_STATUS_IO_ERROR - if an error occured during the read
+ * - SANE_STATUS_IO_ERROR - if an error occurred during the read
  * - SANE_STATUS_INVAL - on every other error
  *
  */
@@ -529,9 +542,9 @@ sanei_usb_claim_interface (SANE_Int dn, SANE_Int interface_number);
  * @param interface_number interface number
  *
  * @return
- * - SANE_STATUS_GOOD - on succes
+ * - SANE_STATUS_GOOD - on success
  * - SANE_STATUS_EOF - if zero bytes have been read
- * - SANE_STATUS_IO_ERROR - if an error occured during the read
+ * - SANE_STATUS_IO_ERROR - if an error occurred during the read
  * - SANE_STATUS_INVAL - on every other error
  *
  */
@@ -547,9 +560,9 @@ sanei_usb_release_interface (SANE_Int dn, SANE_Int interface_number);
  * @param alternate, alternate nummber
  *
  * @return
- * - SANE_STATUS_GOOD - on succes
+ * - SANE_STATUS_GOOD - on success
  * - SANE_STATUS_EOF - if zero bytes have been read
- * - SANE_STATUS_IO_ERROR - if an error occured during the read
+ * - SANE_STATUS_IO_ERROR - if an error occurred during the read
  * - SANE_STATUS_INVAL - on every other error
  *
  */
@@ -566,7 +579,7 @@ sanei_usb_set_altinterface (SANE_Int dn, SANE_Int alternate);
  * @param desc where to put the information to
  *
  * @return
- * - SANE_STATUS_GOOD - on succes
+ * - SANE_STATUS_GOOD - on success
  * - SANE_STATUS_UNSUPPORTED - if the feature is not supported by the OS or
  *   SANE.
  * - SANE_STATUS_INVAL - on every other error
diff --git a/include/sane/sanei_wire.h b/include/sane/sanei_wire.h
index 679814e..9698c4b 100644
--- a/include/sane/sanei_wire.h
+++ b/include/sane/sanei_wire.h
@@ -13,8 +13,8 @@
    License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with sane; see the file COPYING.  If not, write to the Free
-   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with sane; see the file COPYING.
+   If not, see <https://www.gnu.org/licenses/>.
 
    As a special exception, the authors of SANE give permission for
    additional uses of the libraries contained in this release of SANE.
diff --git a/include/sane/saneopts.h b/include/sane/saneopts.h
index 4a4b8cc..7c5933c 100644
--- a/include/sane/saneopts.h
+++ b/include/sane/saneopts.h
@@ -13,8 +13,8 @@
    for more details.
 
    You should have received a copy of the GNU General Public License
-   along with sane; see the file COPYING.  If not, write to the Free
-   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with sane; see the file COPYING.
+   If not, see <https://www.gnu.org/licenses/>.
 
    As a special exception, the authors of SANE give permission for
    additional uses of the libraries contained in this release of SANE.
@@ -140,6 +140,8 @@
 #define SANE_NAME_SCAN_LAMP_DEN		"scan-lamp-density"
 #define SANE_NAME_SELECT_LAMP_DENSITY	"select-lamp-density"
 #define SANE_NAME_LAMP_OFF_AT_EXIT	"lamp-off-at-exit"
+#define SANE_NAME_FOCUS			"focus"
+#define SANE_NAME_AUTOFOCUS		"autofocus"
 
 /* well known options from 'SENSORS' group*/
 #define SANE_NAME_SCAN			"scan"
@@ -229,6 +231,8 @@
 #define SANE_TITLE_SCAN_LAMP_DEN	SANE_I18N("Scan lamp density")
 #define SANE_TITLE_SELECT_LAMP_DENSITY	SANE_I18N("Set lamp density")
 #define SANE_TITLE_LAMP_OFF_AT_EXIT	SANE_I18N("Lamp off at exit")
+#define SANE_TITLE_FOCUS		SANE_I18N("Focus position")
+#define SANE_TITLE_AUTOFOCUS		SANE_I18N("Autofocus")
 
 /* well known options from 'SENSORS' group*/
 #define SANE_TITLE_SCAN			"Scan button"
@@ -439,6 +443,10 @@ SANE_I18N("Define lamp density for scan")
 SANE_I18N("Enable selection of lamp density")
 #define SANE_DESC_LAMP_OFF_AT_EXIT \
 SANE_I18N("Turn off lamp when program exits")
+#define SANE_DESC_FOCUS \
+SANE_I18N("Focus position for manual focus")
+#define SANE_DESC_AUTOFOCUS \
+SANE_I18N("Perform autofocus before scan")
 
 /* well known options from 'SENSORS' group*/
 #define SANE_DESC_SCAN		SANE_I18N("Scan button")