Merge branch 'release/debian/1.0.32-1'debian/1.0.32-1

1 files changed, 13 insertions, 15 deletions

diff --git a/backend/snapscan-sources.c b/backend/snapscan-sources.c
index e8bbb90..45ad6b7 100644
--- a/backend/snapscan-sources.c
+++ b/backend/snapscan-sources.c
@@ -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.
@@ -44,11 +42,12 @@
    If you do not wish that, delete this exception notice.
 
    This file is a component of the implementation of a backend for many
-   of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners. */
-
+   of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners.
+*/
 
-/* $Id$
-   SnapScan backend data sources (implementation) */
+/*
+   SnapScan backend data sources (implementation)
+*/
 
 /**************************************************************************************
 If you get confused from all the structs (like I did when I first saw them),
@@ -689,7 +688,7 @@ typedef struct
     SANE_Bool  ch_lineart;
     SANE_Int   ch_offset;         /* The number of lines to be shifted */
     SANE_Bool  ch_past_init;      /* flag indicating if we have enough data to shift pixels down */
-    SANE_Bool  ch_shift_even;     /* flag indicating wether even or odd pixels are shifted */
+    SANE_Bool  ch_shift_even;     /* flag indicating whether even or odd pixels are shifted */
 } Deinterlacer;
 
 static SANE_Int Deinterlacer_remaining (Source *pself)
@@ -1086,7 +1085,7 @@ static SANE_Status RGBRouter_init (RGBRouter *pself,
     {
         SANE_Int lines_in_buffer = 0;
 
-        /* Size the buffer to accomodate the necessary number of scan
+        /* Size the buffer to accommodate the necessary number of scan
            lines to cater for the offset between R, G and B */
         lines_in_buffer = pss->chroma + 1;
         pself->cb_line_size = pself->bytesPerLine((Source *) pself);
@@ -1216,7 +1215,7 @@ static SANE_Status create_source_chain (SnapScan_Scanner *pss,
         {
         case MD_COLOUR:
             status = create_RGBRouter (pss, *pps, pps);
-            /* We only have the interlace probelms on
+            /* We only have the interlace problems on
                some scanners like the Epson Perfection 2480/2580
                at 2400 dpi. */
             if (status == SANE_STATUS_GOOD &&
@@ -1261,7 +1260,6 @@ static SANE_Status create_source_chain (SnapScan_Scanner *pss,
 }
 
 /*
- * $Log$
  * Revision 1.21  2005/12/02 19:12:54  oliver-guest
  * Another fix for lineart mode for the Epson 3490 @ 3200 DPI
  *
@@ -1334,7 +1332,7 @@ static SANE_Status create_source_chain (SnapScan_Scanner *pss,
  *
  * Revision 1.13  2001/09/18 15:01:07  oliverschwartz
  * - Read scanner id string again after firmware upload
- *   to indentify correct model
+ *   to identify correct model
  * - Make firmware upload work for AGFA scanners
  * - Change copyright notice
  *
@@ -1353,7 +1351,7 @@ static SANE_Status create_source_chain (SnapScan_Scanner *pss,
  *
  * Revision 1.8  2000/11/28 03:55:07  cbagwell
  * Reverting a fix to RGBRouter_remaining to original fix.  This allows
- * most scanners to scan at 600 dpi by ignoring insufficent data in
+ * most scanners to scan at 600 dpi by ignoring insufficient data in
  * the RGB circular buffer and always returning size = 1 in those cases.
  * This should probably be fixed at a higher level.
  *
@@ -1363,7 +1361,7 @@ static SANE_Status create_source_chain (SnapScan_Scanner *pss,
  * value.
  *
  * Revision 1.6  2000/11/04 01:53:58  cbagwell
- * Commiting some needed USB updates.  Added extra test logic to detect
+ * Committing some needed USB updates.  Added extra test logic to detect
  * bad bytes_expected values.  Just to help debug faster on scanners
  * that tickle the bug.
  *
@@ -1377,5 +1375,5 @@ static SANE_Status create_source_chain (SnapScan_Scanner *pss,
  * Add support for Acer300f
  *
  * Revision 1.2  2000/10/13 03:50:27  cbagwell
- * Updating to source from SANE 1.0.3.  Calling this versin 1.1
+ * Updating to source from SANE 1.0.3.  Calling this version 1.1
  * */