minor build number and documentation updates

2012-07-04 06:53:50 +02:00 · 2012-07-04 06:53:50 +02:00 · 34a6dec3bf
commit 34a6dec3bf
--- a/backend/genesys.c
+++ b/backend/genesys.c
@ -58,7 +58,7 @@
 * SANE backend for Genesys Logic GL646/GL841/GL842/GL843/GL847/GL124 based scanners
 */

-#define BUILD 84
+#define BUILD 2301
 #define BACKEND_NAME genesys

 #include "genesys.h"
--- a/backend/genesys_gl124.c
+++ b/backend/genesys_gl124.c
@ -1954,7 +1954,10 @@ gl124_start_action (Genesys_Device * dev)
  return sanei_genesys_write_register (dev, 0x0f, 0x01);
 }

-static SANE_Status
+#ifndef UNIT_TESTING
+static
+#endif
+SANE_Status
 gl124_stop_action (Genesys_Device * dev)
 {
  SANE_Status status;
--- a/backend/genesys_gl646.c
+++ b/backend/genesys_gl646.c
@ -4317,7 +4317,7 @@ gl646_coarse_gain_calibration (Genesys_Device * dev, int dpi)
 {
  uint8_t *line;
  unsigned int i, j, k, channels, val, maximum, idx;
-  unsigned int size, count, resolution, pass;
+  unsigned int count, resolution, pass;
  SANE_Status status = SANE_STATUS_GOOD;
  float average[3];
  Genesys_Settings settings;
@ -4372,8 +4372,6 @@ gl646_coarse_gain_calibration (Genesys_Device * dev, int dpi)
  settings.threshold = 0;
  settings.exposure_time = 0;

-  size = channels * settings.pixels * settings.lines;
-
  /* start gain value */
  dev->frontend.gain[0] = 1;
  dev->frontend.gain[1] = 1;
--- a/backend/p5.c
+++ b/backend/p5.c
@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.

-   Copyright (C) 2009 Stéphane Voltz <stef.dev@free.fr>
+   Copyright (C) 2009-12 Stéphane Voltz <stef.dev@free.fr>

   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
@ -54,7 +54,7 @@
 /**
 * the build number allow to know which version of the backend is running.
 */
-#define BUILD 1
+#define BUILD 2301

 #include "p5.h"

--- a/backend/p5.h
+++ b/backend/p5.h
@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.

-   Copyright (C) 2009 stef.dev@free.fr
+   Copyright (C) 2009-2012 stef.dev@free.fr
   
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
--- a/backend/p5_device.h
+++ b/backend/p5_device.h
@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.

-   Copyright (C) 2009 stef.dev@free.fr
+   Copyright (C) 2009-2012 stef.dev@free.fr
   
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
--- a/backend/rts8891.c
+++ b/backend/rts8891.c
@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.

-   Copyright (C) 2007-2009 stef.dev@free.fr
+   Copyright (C) 2007-2012 stef.dev@free.fr

   This file is part of the SANE package.

@ -118,7 +118,7 @@

 /* #define FAST_INIT 1 */

-#define BUILD 31
+#define BUILD 2301

 #define MOVE_DPI 100

--- a/backend/rts8891.h
+++ b/backend/rts8891.h
@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.

-   Copyright (C) 2007-2009 stef.dev@free.fr
+   Copyright (C) 2007-2012 stef.dev@free.fr
   
   This file is part of the SANE package.
   
--- a/backend/rts8891_devices.c
+++ b/backend/rts8891_devices.c
@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.

-   Copyright (C) 2007-2009 stef.dev@free.fr
+   Copyright (C) 2007-2012 stef.dev@free.fr
   
   This file is part of the SANE package.
   
--- a/backend/rts8891_low.c
+++ b/backend/rts8891_low.c
@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.

-   Copyright (C) 2007-2009 stef.dev@free.fr
+   Copyright (C) 2007-2012 stef.dev@free.fr
   
   This file is part of the SANE package.
   
--- a/backend/rts8891_low.h
+++ b/backend/rts8891_low.h
@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.

-   Copyright (C) 2007-2009 stef.dev@free.fr
+   Copyright (C) 2007-2012 stef.dev@free.fr
   
   This file is part of the SANE package.
   
--- a/backend/rts88xx_lib.c
+++ b/backend/rts88xx_lib.c
@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.

-   Copyright (C) 2007-2009 stef.dev@free.fr
+   Copyright (C) 2007-2012 stef.dev@free.fr

   This file is part of the SANE package.

--- a/backend/rts88xx_lib.h
+++ b/backend/rts88xx_lib.h
@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.

-   Copyright (C) 2007-2009 stef.dev@free.fr
+   Copyright (C) 2007-2012 stef.dev@free.fr

   This file is part of the SANE package.

--- a/backend/umax_pp.c
+++ b/backend/umax_pp.c
@ -1,5 +1,5 @@
 /* sane - Scanner Access Now Easy.
-   Copyright (C) 2001-2008 Stéphane Voltz <stef.dev@free.fr>
+   Copyright (C) 2001-2012 Stéphane Voltz <stef.dev@free.fr>
   This file is part of the SANE package.

   This program is free software; you can redistribute it and/or
@ -107,8 +107,8 @@
 *  see Changelog
 */

-#define UMAX_PP_BUILD   700
-#define UMAX_PP_STATE   "testing"
+#define UMAX_PP_BUILD   2301
+#define UMAX_PP_STATE   "release"

 static int num_devices = 0;
 static Umax_PP_Descriptor *devlist = NULL;
--- a/backend/umax_pp.h
+++ b/backend/umax_pp.h
@ -1,5 +1,5 @@
 /* sane - Scanner Access Now Easy.
-   Copyright (C) 2001-2008 Stéphane Voltz <stef.dev@free.fr>
+   Copyright (C) 2001-2012 Stéphane Voltz <stef.dev@free.fr>
   This file is part of the SANE package.

   This program is free software; you can redistribute it and/or
--- a/backend/umax_pp_low.c
+++ b/backend/umax_pp_low.c
@ -1,5 +1,5 @@
 /**
-   Copyright (C) 2001-2008 Stéphane Voltz <stef.dev@free.fr>
+   Copyright (C) 2001-2012 Stéphane Voltz <stef.dev@free.fr>
   This file is part of the SANE package.

   This program is free software; you can redistribute it and/or
--- a/backend/umax_pp_low.h
+++ b/backend/umax_pp_low.h
@ -1,5 +1,5 @@
 /* sane - Scanner Access Now Easy.
-   Copyright (C) 2001-2008 Stéphane Voltz <stef.dev@free.fr>
+   Copyright (C) 2001-2012 Stéphane Voltz <stef.dev@free.fr>
   This file is part of the SANE package.

   This program is free software; you can redistribute it and/or
--- a/backend/umax_pp_mid.c
+++ b/backend/umax_pp_mid.c
@ -1,5 +1,5 @@
 /* sane - Scanner Access Now Easy.
-   Copyright (C) 2001-2008 Stéphane Voltz <stef.dev@free.fr>
+   Copyright (C) 2001-2012 Stéphane Voltz <stef.dev@free.fr>
   This file is part of the SANE package.

   This program is free software; you can redistribute it and/or
--- a/backend/umax_pp_mid.h
+++ b/backend/umax_pp_mid.h
@ -1,5 +1,5 @@
 /* sane - Scanner Access Now Easy.
-   Copyright (C) 2001-2008 Stéphane Voltz <stef.dev@free.fr>
+   Copyright (C) 2001-2012 Stéphane Voltz <stef.dev@free.fr>
   This file is part of the SANE package.

   This program is free software; you can redistribute it and/or
--- a/doc/sane-genesys.man
+++ b/doc/sane-genesys.man
@ -1,4 +1,4 @@
-.TH "sane\-genesys" "5" "26 Dec 2010" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH "sane\-genesys" "5" "4 Jul 2012" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-genesys
 .SH "NAME"
 sane\-genesys \- SANE backend for GL646, GL841, GL843, GL847 and GL124 based USB flatbed scanners
@ -43,7 +43,7 @@ or syslog) to the sane\-devel mailing list. Even if the scanner's name is only
 slightly different from the models mentioned above, please let me know.
 .PP 
 If you own a scanner that isn't detected by the genesys backend but has a GL646,
-GL841, GL843 or GL847 chipset, you can try to add it to the backend. 
+GL841, GL843, GL847 or GL124 chipset, you can try to add it to the backend. 
 .PP 
 .SH "CALIBRATION"
 To give correct image quality, sheet fed scanners need to be calibrated using the
@ -81,6 +81,11 @@ will give a monochrome scan. CIS based scanners can to true gray when no filter
 selected.
 .RE

+.B \-\-lamp\-off\-scan
+.RS
+        The lamp will be turned off during the scan. Calibration is still done with lamp on.
+.RE
+
 .PP
 Additionally, several 'software' options are exposed by the backend. These
 are reimplementations of features provided natively by larger scanners, but