Merge branch 'feature/upstream' into develop

1 files changed, 7 insertions, 12 deletions

diff --git a/backend/dc25.c b/backend/dc25.c
index 6188608..1d9032d 100644
--- a/backend/dc25.c
+++ b/backend/dc25.c
@@ -3,8 +3,6 @@
 
    dc25.c
 
-   $Id$
-
    This file (C) 1998 Peter Fales
 
    This file is part of the SANE package.
@@ -20,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.
@@ -69,7 +65,7 @@
  *	/pub/hakimian directory. The complete URL is:
  *	    ftp://ftp.eecs.wsu.edu/pub/hakimian/dc20.tar.gz
  *
- *	This package also includes a sligthly modified version of the Comet to ppm
+ *	This package also includes a slightly modified version of the Comet to ppm
  *	conversion routine written by YOSHIDA Hideki <hideki@yk.rim.or.jp>
  *
  *	This program is free software; you can redistribute it and/or modify
@@ -1107,7 +1103,7 @@ if (verbose) printf ("%s: determine_limits: low_i = %d, high_i = %d\n", __progna
 }
 
 /*
- * The original dc20ctrl program used a default gamma of 0.35, but I thougt
+ * The original dc20ctrl program used a default gamma of 0.35, but I thought
  * 0.45 looks better.  In addition, since xscanimage seems to always force
  * a resolution of 0.1, I multiply everything by 10 and make the default
  * 4.5.
@@ -1389,7 +1385,7 @@ convert_pic (char *base_name, int format)
   if (format & SAVE_ADJASPECT)
     {
       /*
-       *      Strech image
+       *      Stretch image
        */
 
       if (res)
@@ -1764,7 +1760,7 @@ erase (int fd)
       /*
        * This block may really apply to the DC20 also, but since I
        * don't have one, it's hard to say for sure.  On the DC25, erase
-       * takes long enought that the read may timeout without returning
+       * takes long enough that the read may timeout without returning
        * any data before the erase is complete.   We let this happen
        * up to 4 times, then give up.
        */
@@ -1841,8 +1837,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback __sane_unused__ authorize
 
   fp = sanei_config_open (DC25_CONFIG_FILE);
 
-  DBG (127,
-       "sane_init() $Id$\n");
+  DBG (127, "sane_init()\n");
 
   if (!fp)
     {
@@ -2632,7 +2627,7 @@ sane_read (SANE_Handle __sane_unused__ handle, SANE_Byte * data,
        * If outbytes is zero, then this is the first time
        * we've been called, so update the contrast table.
        * The formula is something I came up with that has the
-       * following prooperties:
+       * following properties:
        * 1) It's a smooth curve that provides the effect I wanted
        *    (bright pixels are made brighter, dim pixels are made
        *    dimmer)