New upstream version 1.0.32upstream/1.0.32

78 files changed, 114 insertions, 268 deletions

diff --git a/backend/genesys/calibration.h b/backend/genesys/calibration.h
index 81d94ea..fc82850 100644
--- a/backend/genesys/calibration.h
+++ b/backend/genesys/calibration.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.
diff --git a/backend/genesys/command_set.h b/backend/genesys/command_set.h
index 056cba8..47bdfbd 100644
--- a/backend/genesys/command_set.h
+++ b/backend/genesys/command_set.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.
diff --git a/backend/genesys/command_set_common.cpp b/backend/genesys/command_set_common.cpp
index 381404e..7afc3ff 100644
--- a/backend/genesys/command_set_common.cpp
+++ b/backend/genesys/command_set_common.cpp
@@ -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/>.
 */
 
 #define DEBUG_DECLARE_ONLY
diff --git a/backend/genesys/command_set_common.h b/backend/genesys/command_set_common.h
index 784fcd7..3b6de86 100644
--- a/backend/genesys/command_set_common.h
+++ b/backend/genesys/command_set_common.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/>.
 */
 
 #ifndef BACKEND_GENESYS_COMMAND_SET_COMMON_H
diff --git a/backend/genesys/device.cpp b/backend/genesys/device.cpp
index 95bede8..4b1940b 100644
--- a/backend/genesys/device.cpp
+++ b/backend/genesys/device.cpp
@@ -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.
diff --git a/backend/genesys/device.h b/backend/genesys/device.h
index ded6a48..f998714 100644
--- a/backend/genesys/device.h
+++ b/backend/genesys/device.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.
@@ -311,7 +309,7 @@ struct Genesys_Device
     bool already_initialized = false;
 
     bool read_active = false;
-    // signal wether the park command has been issued
+    // signal whether the park command has been issued
     bool parking = false;
 
     // for sheetfed scanner's, is TRUE when there is a document in the scanner
diff --git a/backend/genesys/enums.cpp b/backend/genesys/enums.cpp
index cd4be7d..ce0ad10 100644
--- a/backend/genesys/enums.cpp
+++ b/backend/genesys/enums.cpp
@@ -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.
diff --git a/backend/genesys/enums.h b/backend/genesys/enums.h
index 0e16ba4..ae5dedd 100644
--- a/backend/genesys/enums.h
+++ b/backend/genesys/enums.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.
diff --git a/backend/genesys/error.cpp b/backend/genesys/error.cpp
index 46d79c9..e302e22 100644
--- a/backend/genesys/error.cpp
+++ b/backend/genesys/error.cpp
@@ -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.
diff --git a/backend/genesys/error.h b/backend/genesys/error.h
index 26235dd..e95313f 100644
--- a/backend/genesys/error.h
+++ b/backend/genesys/error.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.
diff --git a/backend/genesys/fwd.h b/backend/genesys/fwd.h
index ea335f7..89ca150 100644
--- a/backend/genesys/fwd.h
+++ b/backend/genesys/fwd.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.
diff --git a/backend/genesys/genesys.cpp b/backend/genesys/genesys.cpp
index 9d80cfa..9552fa9 100644
--- a/backend/genesys/genesys.cpp
+++ b/backend/genesys/genesys.cpp
@@ -28,9 +28,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.
@@ -389,7 +387,7 @@ void sanei_genesys_create_default_gamma_table(Genesys_Device* dev,
 
   TODO: Should also consider maximum transfer rate: ~6.5MB/s.
     Note: The enhance option of the scanners does _not_ help. It only halves
-          the amount of pixels transfered.
+          the amount of pixels transferred.
  */
 SANE_Int sanei_genesys_exposure_time2(Genesys_Device * dev, const MotorProfile& profile, float ydpi,
                                       int endpixel, int exposure_by_led)
@@ -3204,7 +3202,7 @@ compute_shifted_coefficients (Genesys_Device * dev,
 			      unsigned int coeff,
 			      unsigned int target_dark,
 			      unsigned int target_bright,
-			      unsigned int patch_size)		/* contigous extent */
+			      unsigned int patch_size)		/* contiguous extent */
 {
   unsigned int x, avgpixels, basepixels, i, j, val1, val2;
   unsigned int br_tmp [3], dk_tmp [3];
@@ -3573,7 +3571,7 @@ static void genesys_send_shading_coefficient(Genesys_Device* dev, const Genesys_
 			            coeff,
  			            0x0001,      /* target_dark */
 			            0xf900,      /* target_bright */
-			            256);        /* patch_size: contigous extent */
+			            256);        /* patch_size: contiguous extent */
       break;
     default:
         throw SaneException(SANE_STATUS_UNSUPPORTED, "sensor %d not supported",
@@ -3598,7 +3596,7 @@ genesys_restore_calibration(Genesys_Device * dev, Genesys_Sensor& sensor)
 {
     DBG_HELPER(dbg);
 
-    // if no cache or no function to evaluate cache entry ther can be no match/
+    // if no cache or no function to evaluate cache entry there can be no match/
     if (dev->calibration_cache.empty()) {
         return false;
     }
@@ -4061,7 +4059,7 @@ static void genesys_start_scan(Genesys_Device* dev, bool lamp_off)
   unsigned int steps, expected;
 
 
-  /* since not all scanners are set ot wait for head to park
+  /* since not all scanners are set to wait for head to park
    * we check we are not still parking before starting a new scan */
     if (dev->parking) {
         sanei_genesys_wait_for_home(dev);
@@ -4166,7 +4164,7 @@ static void genesys_start_scan(Genesys_Device* dev, bool lamp_off)
         return;
     }
 
-  /*do we really need this? the valid data check should be sufficent -- pierre*/
+  /*do we really need this? the valid data check should be sufficient -- pierre*/
   /* waits for head to reach scanning position */
   expected = dev->reg.get8(0x3d) * 65536
            + dev->reg.get8(0x3e) * 256
@@ -4214,7 +4212,7 @@ static void genesys_read_ordered_data(Genesys_Device* dev, SANE_Byte* destinatio
   /* is there data left to scan */
   if (dev->total_bytes_read >= dev->total_bytes_to_read)
     {
-      /* issue park command immediatly in case scanner can handle it
+      /* issue park command immediately in case scanner can handle it
        * so we save time */
         if (!dev->model->is_sheetfed && !has_flag(dev->model->flags, ModelFlag::MUST_WAIT) &&
             !dev->parking)
@@ -4374,7 +4372,7 @@ static Genesys_Settings calculate_scan_settings(Genesys_Scanner* s)
         settings.true_gray = 0;
     }
 
-    // brigthness and contrast only for for 8 bit scans
+    // brightness and contrast only for for 8 bit scans
     if (s->bit_depth == 8) {
         settings.contrast = (s->contrast * 127) / 100;
         settings.brightness = (s->brightness * 127) / 100;
@@ -4479,7 +4477,7 @@ static SANE_Range create_range(float size)
 
 /** @brief generate calibration cache file nam
  * Generates the calibration cache file name to use.
- * Tries to store the chache in $HOME/.sane or
+ * Tries to store the cache in $HOME/.sane or
  * then fallbacks to $TMPDIR or TMP. The filename
  * uses the model name if only one scanner is plugged
  * else is uses the device name when several identical
@@ -4864,7 +4862,7 @@ static void init_options(Genesys_Scanner* s)
   s->opt[OPT_CALIBRATION_FILE].cap = SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED;
   s->opt[OPT_CALIBRATION_FILE].constraint_type = SANE_CONSTRAINT_NONE;
   s->calibration_file.clear();
-  /* disable option if ran as root */
+  /* disable option if run as root */
 #ifdef HAVE_GETUID
   if(geteuid()==0)
     {
@@ -5186,7 +5184,8 @@ static SANE_Status attach_one_device(SANE_String_Const devname) noexcept
 
 // this function is passed to C API, it must not throw
 static SANE_Status
-config_attach_genesys(SANEI_Config __sane_unused__ *config, const char *devname) noexcept
+config_attach_genesys(SANEI_Config __sane_unused__ *config, const char *devname,
+                      void __sane_unused__ *data) noexcept
 {
   /* the devname has been processed and is ready to be used
    * directly. Since the backend is an USB only one, we can
@@ -5214,7 +5213,8 @@ static void probe_genesys_devices()
     config.values = nullptr;
   config.count = 0;
 
-    auto status = sanei_configure_attach(GENESYS_CONFIG_FILE, &config, config_attach_genesys);
+    auto status = sanei_configure_attach(GENESYS_CONFIG_FILE, &config,
+                                         config_attach_genesys, NULL);
     if (status == SANE_STATUS_ACCESS_DENIED) {
         dbg.vlog(DBG_error0, "Critical error: Couldn't access configuration file '%s'",
                  GENESYS_CONFIG_FILE);
@@ -5346,7 +5346,7 @@ void sane_init_impl(SANE_Int * version_code, SANE_Auth_Callback authorize)
 #endif
     );
 
-    // cold-plug case :detection of allready connected scanners
+    // cold-plug case :detection of already connected scanners
     s_attach_device_by_name_evaluate_bcd_device = false;
     probe_genesys_devices();
 }
@@ -6333,7 +6333,7 @@ SANE_Status sane_read_impl(SANE_Handle handle, SANE_Byte * buf, SANE_Int max_len
     {
       DBG(DBG_proc, "%s: nothing more to scan: EOF\n", __func__);
 
-      /* issue park command immediatly in case scanner can handle it
+      /* issue park command immediately in case scanner can handle it
        * so we save time */
         if (!dev->model->is_sheetfed && !has_flag(dev->model->flags, ModelFlag::MUST_WAIT) &&
             !dev->parking)
diff --git a/backend/genesys/genesys.h b/backend/genesys/genesys.h
index 9b1a087..19d6feb 100644
--- a/backend/genesys/genesys.h
+++ b/backend/genesys/genesys.h
@@ -18,9 +18,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/backend/genesys/gl124.cpp b/backend/genesys/gl124.cpp
index d3fc1bc..ed733b8 100644
--- a/backend/genesys/gl124.cpp
+++ b/backend/genesys/gl124.cpp
@@ -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.
@@ -567,7 +565,7 @@ static void gl124_init_motor_regs_scan(Genesys_Device* dev,
     reg->set16(REG_FSHDEC, fast_table.table.size());
     reg->set16(REG_FMOVNO, fast_table.table.size());
 
-  /* substract acceleration distance from feedl */
+  /* subtract acceleration distance from feedl */
   feedl=feed_steps;
     feedl <<= static_cast<unsigned>(motor_profile.step_type);
 
@@ -1058,7 +1056,7 @@ void CommandSetGl124::send_shading_data(Genesys_Device* dev, const Genesys_Senso
   for(i=0;i<3;i++)
     {
       /* copy data to work buffer and process it */
-          /* coefficent destination */
+          /* coefficient destination */
       ptr = buffer.data();
 
       /* iterate on both sensor segment */
diff --git a/backend/genesys/gl124.h b/backend/genesys/gl124.h
index ea7041e..b722e67 100644
--- a/backend/genesys/gl124.h
+++ b/backend/genesys/gl124.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.
diff --git a/backend/genesys/gl124_registers.h b/backend/genesys/gl124_registers.h
index 9b42084..66c5fda 100644
--- a/backend/genesys/gl124_registers.h
+++ b/backend/genesys/gl124_registers.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.
diff --git a/backend/genesys/gl646.cpp b/backend/genesys/gl646.cpp
index 61fa1e0..acc1a4b 100644
--- a/backend/genesys/gl646.cpp
+++ b/backend/genesys/gl646.cpp
@@ -22,9 +22,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.
@@ -98,7 +96,7 @@ struct Motor_Master
 
 /**
  * master motor settings, for a given motor and dpi,
- * it gives steps and speed informations
+ * it gives steps and speed information
  */
 static Motor_Master motor_master[] = {
     /* HP3670 motor settings */
@@ -1040,7 +1038,7 @@ gl646_init_regs (Genesys_Device * dev)
       dev->reg.find_reg(0x6d).value = 0x01;	/* select deceleration steps whenever go home (0), accel/decel stop time (31 * LPeriod) */
       break;
     }
-  dev->reg.find_reg(0x6c).value = 0x00;	/* peroid times for LPeriod, expR,expG,expB, Z1MODE, Z2MODE (one period time) */
+  dev->reg.find_reg(0x6c).value = 0x00;	/* period times for LPeriod, expR,expG,expB, Z1MODE, Z2MODE (one period time) */
 }
 
 // Set values of Analog Device type frontend
@@ -1480,7 +1478,7 @@ void CommandSetGl646::detect_document_end(Genesys_Device* dev) const
  * eject document from the feeder
  * currently only used by XP200
  * TODO we currently rely on AGOHOME not being set for sheetfed scanners,
- * maybe check this flag in eject to let the document being eject automaticaly
+ * maybe check this flag in eject to let the document being eject automatically
  */
 void CommandSetGl646::eject_document(Genesys_Device* dev) const
 {
@@ -1491,7 +1489,7 @@ void CommandSetGl646::eject_document(Genesys_Device* dev) const
     unsigned count;
     std::uint8_t gpio;
 
-  /* at the end there will be noe more document */
+  /* at the end there will be no more document */
     dev->document = false;
 
     // first check for document event
@@ -2512,7 +2510,7 @@ void CommandSetGl646::init_regs_for_warmup(Genesys_Device* dev, const Genesys_Se
 /* *
  * initialize ASIC : registers, motor tables, and gamma tables
  * then ensure scanner's head is at home
- * @param dev device description of the scanner to initailize
+ * @param dev device description of the scanner to initialize
  */
 void CommandSetGl646::init(Genesys_Device* dev) const
 {
@@ -2739,7 +2737,7 @@ static void simple_scan(Genesys_Device* dev, const Genesys_Sensor& sensor,
 
 /**
  * update the status of the required sensor in the scanner session
- * the button fileds are used to make events 'sticky'
+ * the button fields are used to make events 'sticky'
  */
 void CommandSetGl646::update_hardware_sensors(Genesys_Scanner* session) const
 {
diff --git a/backend/genesys/gl646.h b/backend/genesys/gl646.h
index 8ab2c96..e4c8d6b 100644
--- a/backend/genesys/gl646.h
+++ b/backend/genesys/gl646.h
@@ -18,9 +18,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/backend/genesys/gl646_registers.h b/backend/genesys/gl646_registers.h
index 6ee9549..1c50888 100644
--- a/backend/genesys/gl646_registers.h
+++ b/backend/genesys/gl646_registers.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.
diff --git a/backend/genesys/gl841.cpp b/backend/genesys/gl841.cpp
index 731354f..62e0e9d 100644
--- a/backend/genesys/gl841.cpp
+++ b/backend/genesys/gl841.cpp
@@ -24,9 +24,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.
@@ -999,7 +997,7 @@ void CommandSetGl841::init_regs_for_scan_session(Genesys_Device* dev, const Gene
   int dummy = 0;
 
 /* dummy */
-  /* dummy lines: may not be usefull, for instance 250 dpi works with 0 or 1
+  /* dummy lines: may not be useful, for instance 250 dpi works with 0 or 1
      dummy line. Maybe the dummy line adds correctness since the motor runs
      slower (higher dpi)
   */
@@ -2256,7 +2254,7 @@ void CommandSetGl841::send_shading_data(Genesys_Device* dev, const Genesys_Senso
   for(i=0;i<3;i++)
     {
       /* copy data to work buffer and process it */
-          /* coefficent destination */
+          /* coefficient destination */
       ptr=buffer.data();
 
       /* iterate on both sensor segment, data has been averaged,
diff --git a/backend/genesys/gl841.h b/backend/genesys/gl841.h
index c9f15ee..dbe2e59 100644
--- a/backend/genesys/gl841.h
+++ b/backend/genesys/gl841.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.
diff --git a/backend/genesys/gl841_registers.h b/backend/genesys/gl841_registers.h
index 2fac278..a8d924d 100644
--- a/backend/genesys/gl841_registers.h
+++ b/backend/genesys/gl841_registers.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.
diff --git a/backend/genesys/gl842.cpp b/backend/genesys/gl842.cpp
index d5bebe5..9d3da67 100644
--- a/backend/genesys/gl842.cpp
+++ b/backend/genesys/gl842.cpp
@@ -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.
@@ -362,7 +360,7 @@ static void gl842_init_motor_regs_scan(Genesys_Device* dev,
         reg->set8(REG_0x80, vref);
     }
 
-    // substract acceleration distance from feedl
+    // subtract acceleration distance from feedl
     unsigned feedl = feed_steps;
     feedl <<= static_cast<unsigned>(motor_profile.step_type);
 
diff --git a/backend/genesys/gl842.h b/backend/genesys/gl842.h
index 288d29c..b20ef5e 100644
--- a/backend/genesys/gl842.h
+++ b/backend/genesys/gl842.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.
diff --git a/backend/genesys/gl842_registers.h b/backend/genesys/gl842_registers.h
index b6934ce..ceb540b 100644
--- a/backend/genesys/gl842_registers.h
+++ b/backend/genesys/gl842_registers.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.
diff --git a/backend/genesys/gl843.cpp b/backend/genesys/gl843.cpp
index 8233bde..e768ac0 100644
--- a/backend/genesys/gl843.cpp
+++ b/backend/genesys/gl843.cpp
@@ -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.
@@ -781,7 +779,7 @@ static void gl843_init_motor_regs_scan(Genesys_Device* dev,
         reg->set8(REG_0x80, vref);
     }
 
-  /* substract acceleration distance from feedl */
+  /* subtract acceleration distance from feedl */
   feedl=feed_steps;
     feedl <<= static_cast<unsigned>(motor_profile.step_type);
 
@@ -872,7 +870,7 @@ static void gl843_init_motor_regs_scan(Genesys_Device* dev,
  *        scan's one
  * @param start logical start pixel coordinate
  * @param pixels logical number of pixels to use
- * @param channels number of color channles used (1 or 3)
+ * @param channels number of color channels used (1 or 3)
  * @param depth bit depth of the scan (1, 8 or 16 bits)
  * @param color_filter to choose the color channel used in gray scans
  * @param flags to drive specific settings such no calibration, XPA use ...
diff --git a/backend/genesys/gl843.h b/backend/genesys/gl843.h
index 5326a2d..fe2814d 100644
--- a/backend/genesys/gl843.h
+++ b/backend/genesys/gl843.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.
diff --git a/backend/genesys/gl843_registers.h b/backend/genesys/gl843_registers.h
index cbc38c0..ab1f4c7 100644
--- a/backend/genesys/gl843_registers.h
+++ b/backend/genesys/gl843_registers.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.
diff --git a/backend/genesys/gl846.cpp b/backend/genesys/gl846.cpp
index cae7414..c8907b2 100644
--- a/backend/genesys/gl846.cpp
+++ b/backend/genesys/gl846.cpp
@@ -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.
@@ -823,7 +821,7 @@ void CommandSetGl846::end_scan(Genesys_Device* dev, Genesys_Register_Set* reg,
     }
 }
 
-// Moves the slider to the home (top) postion slowly
+// Moves the slider to the home (top) position slowly
 void CommandSetGl846::move_back_home(Genesys_Device* dev, bool wait_until_home) const
 {
     scanner_move_back_home(*dev, wait_until_home);
diff --git a/backend/genesys/gl846.h b/backend/genesys/gl846.h
index f794a01..d06b337 100644
--- a/backend/genesys/gl846.h
+++ b/backend/genesys/gl846.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.
diff --git a/backend/genesys/gl846_registers.h b/backend/genesys/gl846_registers.h
index e4a8ac5..df45e4f 100644
--- a/backend/genesys/gl846_registers.h
+++ b/backend/genesys/gl846_registers.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.
diff --git a/backend/genesys/gl847.cpp b/backend/genesys/gl847.cpp
index f8f6b1c..91ac4eb 100644
--- a/backend/genesys/gl847.cpp
+++ b/backend/genesys/gl847.cpp
@@ -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.
diff --git a/backend/genesys/gl847.h b/backend/genesys/gl847.h
index aa4fb85..2cb3a9f 100644
--- a/backend/genesys/gl847.h
+++ b/backend/genesys/gl847.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.
diff --git a/backend/genesys/gl847_registers.h b/backend/genesys/gl847_registers.h
index aa3d43b..66fda4b 100644
--- a/backend/genesys/gl847_registers.h
+++ b/backend/genesys/gl847_registers.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.
diff --git a/backend/genesys/image.cpp b/backend/genesys/image.cpp
index 793a209..3ea6ef6 100644
--- a/backend/genesys/image.cpp
+++ b/backend/genesys/image.cpp
@@ -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.
diff --git a/backend/genesys/image.h b/backend/genesys/image.h
index 798594e..0ad344e 100644
--- a/backend/genesys/image.h
+++ b/backend/genesys/image.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.
diff --git a/backend/genesys/image_buffer.cpp b/backend/genesys/image_buffer.cpp
index c4f8019..46ca292 100644
--- a/backend/genesys/image_buffer.cpp
+++ b/backend/genesys/image_buffer.cpp
@@ -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.
diff --git a/backend/genesys/image_buffer.h b/backend/genesys/image_buffer.h
index 1910244..516e828 100644
--- a/backend/genesys/image_buffer.h
+++ b/backend/genesys/image_buffer.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.
diff --git a/backend/genesys/image_pipeline.cpp b/backend/genesys/image_pipeline.cpp
index 8d67be9..4161e95 100644
--- a/backend/genesys/image_pipeline.cpp
+++ b/backend/genesys/image_pipeline.cpp
@@ -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.
diff --git a/backend/genesys/image_pipeline.h b/backend/genesys/image_pipeline.h
index d4aef49..3632b36 100644
--- a/backend/genesys/image_pipeline.h
+++ b/backend/genesys/image_pipeline.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.
diff --git a/backend/genesys/image_pixel.cpp b/backend/genesys/image_pixel.cpp
index 1b83e12..011a086 100644
--- a/backend/genesys/image_pixel.cpp
+++ b/backend/genesys/image_pixel.cpp
@@ -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.
diff --git a/backend/genesys/image_pixel.h b/backend/genesys/image_pixel.h
index aa9980e..4b16083 100644
--- a/backend/genesys/image_pixel.h
+++ b/backend/genesys/image_pixel.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.
diff --git a/backend/genesys/low.cpp b/backend/genesys/low.cpp
index 05ef46b..ddd2c88 100644
--- a/backend/genesys/low.cpp
+++ b/backend/genesys/low.cpp
@@ -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.
@@ -761,7 +759,7 @@ void sanei_genesys_send_gamma_table(Genesys_Device* dev, const Genesys_Sensor& s
       val &= ~(0x01 << i);
         dev->interface->write_register(0xbe, val);
 
-      // FIXME: currently the last word of each gamma table is not initialied, so to work around
+      // FIXME: currently the last word of each gamma table is not initialized, so to work around
       // unstable data, just set it to 0 which is the most likely value of uninitialized memory
       // (proper value is probably 0xff)
       gamma[size * 2 * i + size * 2 - 2] = 0;
@@ -1789,7 +1787,7 @@ int sanei_genesys_get_lowest_dpi(Genesys_Device *dev)
  * true if they are compatible.
  * A calibration cache is compatible if color mode and x dpi match the user
  * requested scan. In the case of CIS scanners, dpi isn't a criteria.
- * flatbed cache entries are considred too old and then expires if they
+ * flatbed cache entries are considered too old and then expires if they
  * are older than the expiration time option, forcing calibration at least once
  * then given time. */
 bool sanei_genesys_is_compatible_calibration(Genesys_Device* dev,
@@ -1853,7 +1851,7 @@ bool sanei_genesys_is_compatible_calibration(Genesys_Device* dev,
       return false;
     }
 
-  /* a cache entry expires after afetr expiration time for non sheetfed scanners */
+  /* a cache entry expires after after expiration time for non sheetfed scanners */
   /* this is not taken into account when overwriting cache entries    */
 #ifdef HAVE_SYS_TIME_H
     if (!for_overwrite && dev->settings.expiration_time >=0)
diff --git a/backend/genesys/low.h b/backend/genesys/low.h
index d67b427..ac149b5 100644
--- a/backend/genesys/low.h
+++ b/backend/genesys/low.h
@@ -22,9 +22,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/backend/genesys/motor.cpp b/backend/genesys/motor.cpp
index a18d6e1..8450fea 100644
--- a/backend/genesys/motor.cpp
+++ b/backend/genesys/motor.cpp
@@ -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.
diff --git a/backend/genesys/motor.h b/backend/genesys/motor.h
index c433c0e..e5fd695 100644
--- a/backend/genesys/motor.h
+++ b/backend/genesys/motor.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.
@@ -62,7 +60,7 @@ namespace genesys {
         s - distance travelled in steps
         t - time in pixeltime
 
-    The physical mode defines the curve in physical quantities. We asssume that the scanner head
+    The physical mode defines the curve in physical quantities. We assume that the scanner head
     accelerates from standstill to the target speed uniformly. Then:
 
     v(t) = v(0) + a * t                                                                         (2)
diff --git a/backend/genesys/register.h b/backend/genesys/register.h
index 51aab90..cee9adf 100644
--- a/backend/genesys/register.h
+++ b/backend/genesys/register.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.
diff --git a/backend/genesys/register_cache.h b/backend/genesys/register_cache.h
index dce701a..c7e5c41 100644
--- a/backend/genesys/register_cache.h
+++ b/backend/genesys/register_cache.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.
diff --git a/backend/genesys/row_buffer.h b/backend/genesys/row_buffer.h
index e1a0c82..a4b9e42 100644
--- a/backend/genesys/row_buffer.h
+++ b/backend/genesys/row_buffer.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.
diff --git a/backend/genesys/scanner_interface.cpp b/backend/genesys/scanner_interface.cpp
index 0b60b66..5363f0e 100644
--- a/backend/genesys/scanner_interface.cpp
+++ b/backend/genesys/scanner_interface.cpp
@@ -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.
diff --git a/backend/genesys/scanner_interface.h b/backend/genesys/scanner_interface.h
index 70413d1..8258117 100644
--- a/backend/genesys/scanner_interface.h
+++ b/backend/genesys/scanner_interface.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.
diff --git a/backend/genesys/scanner_interface_usb.cpp b/backend/genesys/scanner_interface_usb.cpp
index d405ede..117297c 100644
--- a/backend/genesys/scanner_interface_usb.cpp
+++ b/backend/genesys/scanner_interface_usb.cpp
@@ -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.
diff --git a/backend/genesys/scanner_interface_usb.h b/backend/genesys/scanner_interface_usb.h
index 33fb8fe..569d634 100644
--- a/backend/genesys/scanner_interface_usb.h
+++ b/backend/genesys/scanner_interface_usb.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.
diff --git a/backend/genesys/sensor.cpp b/backend/genesys/sensor.cpp
index ce51403..b09745f 100644
--- a/backend/genesys/sensor.cpp
+++ b/backend/genesys/sensor.cpp
@@ -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.
diff --git a/backend/genesys/sensor.h b/backend/genesys/sensor.h
index ca6fef7..6f87607 100644
--- a/backend/genesys/sensor.h
+++ b/backend/genesys/sensor.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.
diff --git a/backend/genesys/serialize.h b/backend/genesys/serialize.h
index ed40a4e..138ff08 100644
--- a/backend/genesys/serialize.h
+++ b/backend/genesys/serialize.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.
diff --git a/backend/genesys/settings.cpp b/backend/genesys/settings.cpp
index c2b54dc..7f64798 100644
--- a/backend/genesys/settings.cpp
+++ b/backend/genesys/settings.cpp
@@ -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.
diff --git a/backend/genesys/settings.h b/backend/genesys/settings.h
index f78845b..4c834fa 100644
--- a/backend/genesys/settings.h
+++ b/backend/genesys/settings.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.
diff --git a/backend/genesys/static_init.cpp b/backend/genesys/static_init.cpp
index c0f3748..5ed3b50 100644
--- a/backend/genesys/static_init.cpp
+++ b/backend/genesys/static_init.cpp
@@ -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.
diff --git a/backend/genesys/static_init.h b/backend/genesys/static_init.h
index 3ffa62c..e0b39c8 100644
--- a/backend/genesys/static_init.h
+++ b/backend/genesys/static_init.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.
diff --git a/backend/genesys/status.cpp b/backend/genesys/status.cpp
index 7f883b0..170bcd7 100644
--- a/backend/genesys/status.cpp
+++ b/backend/genesys/status.cpp
@@ -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.
diff --git a/backend/genesys/status.h b/backend/genesys/status.h
index 91f4692..f1a3695 100644
--- a/backend/genesys/status.h
+++ b/backend/genesys/status.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.
diff --git a/backend/genesys/tables_frontend.cpp b/backend/genesys/tables_frontend.cpp
index 5eb6e3c..02e9998 100644
--- a/backend/genesys/tables_frontend.cpp
+++ b/backend/genesys/tables_frontend.cpp
@@ -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.
diff --git a/backend/genesys/tables_gpo.cpp b/backend/genesys/tables_gpo.cpp
index 5c1c54f..075cafb 100644
--- a/backend/genesys/tables_gpo.cpp
+++ b/backend/genesys/tables_gpo.cpp
@@ -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.
diff --git a/backend/genesys/tables_memory_layout.cpp b/backend/genesys/tables_memory_layout.cpp
index 3eaedd4..77c7ce7 100644
--- a/backend/genesys/tables_memory_layout.cpp
+++ b/backend/genesys/tables_memory_layout.cpp
@@ -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/>.
 */
 
 #define DEBUG_DECLARE_ONLY
diff --git a/backend/genesys/tables_model.cpp b/backend/genesys/tables_model.cpp
index 2c5e6a3..6998a51 100644
--- a/backend/genesys/tables_model.cpp
+++ b/backend/genesys/tables_model.cpp
@@ -26,9 +26,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.
@@ -65,7 +63,7 @@ void genesys_init_usb_device_tables()
     /*  Guidelines on calibration area sizes
         ------------------------------------
 
-        on many scanners scanning a single line takes aroung 10ms. In order not to take excessive
+        on many scanners scanning a single line takes around 10ms. In order not to take excessive
         amount of time, the sizes of the calibration area are limited as follows:
         2400 dpi or less: 4mm (would take ~4 seconds on 2400 dpi)
         4800 dpi or less: 3mm (would take ~6 seconds on 4800 dpi)
diff --git a/backend/genesys/tables_motor.cpp b/backend/genesys/tables_motor.cpp
index a452fe5..e8e89c5 100644
--- a/backend/genesys/tables_motor.cpp
+++ b/backend/genesys/tables_motor.cpp
@@ -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.
diff --git a/backend/genesys/tables_sensor.cpp b/backend/genesys/tables_sensor.cpp
index b90355c..8383287 100644
--- a/backend/genesys/tables_sensor.cpp
+++ b/backend/genesys/tables_sensor.cpp
@@ -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.
diff --git a/backend/genesys/test_scanner_interface.cpp b/backend/genesys/test_scanner_interface.cpp
index e8af494..5d0dcd3 100644
--- a/backend/genesys/test_scanner_interface.cpp
+++ b/backend/genesys/test_scanner_interface.cpp
@@ -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.
diff --git a/backend/genesys/test_scanner_interface.h b/backend/genesys/test_scanner_interface.h
index fc8128c..c1a3b76 100644
--- a/backend/genesys/test_scanner_interface.h
+++ b/backend/genesys/test_scanner_interface.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.
diff --git a/backend/genesys/test_settings.cpp b/backend/genesys/test_settings.cpp
index f328709..ba50f36 100644
--- a/backend/genesys/test_settings.cpp
+++ b/backend/genesys/test_settings.cpp
@@ -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.
diff --git a/backend/genesys/test_settings.h b/backend/genesys/test_settings.h
index 38cc3b3..90c6e50 100644
--- a/backend/genesys/test_settings.h
+++ b/backend/genesys/test_settings.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.
diff --git a/backend/genesys/test_usb_device.cpp b/backend/genesys/test_usb_device.cpp
index 1612eae..46cd4e5 100644
--- a/backend/genesys/test_usb_device.cpp
+++ b/backend/genesys/test_usb_device.cpp
@@ -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.
diff --git a/backend/genesys/test_usb_device.h b/backend/genesys/test_usb_device.h
index 03b49cc..6fd0ff3 100644
--- a/backend/genesys/test_usb_device.h
+++ b/backend/genesys/test_usb_device.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.
diff --git a/backend/genesys/usb_device.cpp b/backend/genesys/usb_device.cpp
index d6cbaed..63afb09 100644
--- a/backend/genesys/usb_device.cpp
+++ b/backend/genesys/usb_device.cpp
@@ -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.
diff --git a/backend/genesys/usb_device.h b/backend/genesys/usb_device.h
index aa8b89a..72f7017 100644
--- a/backend/genesys/usb_device.h
+++ b/backend/genesys/usb_device.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.
diff --git a/backend/genesys/utilities.h b/backend/genesys/utilities.h
index fdab770..6e637d0 100644
--- a/backend/genesys/utilities.h
+++ b/backend/genesys/utilities.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.
diff --git a/backend/genesys/value_filter.h b/backend/genesys/value_filter.h
index ba55567..4fdc9ca 100644
--- a/backend/genesys/value_filter.h
+++ b/backend/genesys/value_filter.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/>.
 */
 
 #ifndef BACKEND_GENESYS_VALUE_FILTER_H