Merge branch 'release/experimental/1.0.29-1_experimental1'experimental/1.0.29-1_experimental1

1 files changed, 21 insertions, 18 deletions

diff --git a/backend/gt68xx_low.h b/backend/gt68xx_low.h
index 0743230..89bd365 100644
--- a/backend/gt68xx_low.h
+++ b/backend/gt68xx_low.h
@@ -2,44 +2,44 @@
 
    Copyright (C) 2002 Sergey Vlasov <vsu@altlinux.ru>
    Copyright (C) 2002 - 2007 Henning Geinitz <sane@geinitz.org>
-   
+
    This file is part of the SANE package.
-   
+
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
    published by the Free Software Foundation; either version 2 of the
    License, or (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    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.
-   
+
    As a special exception, the authors of SANE give permission for
    additional uses of the libraries contained in this release of SANE.
-   
+
    The exception is that, if you link a SANE library with other files
    to produce an executable, this does not by itself cause the
    resulting executable to be covered by the GNU General Public
    License.  Your use of that executable is in no way restricted on
    account of linking the SANE library code into it.
-   
+
    This exception does not, however, invalidate any other reasons why
    the executable file might be covered by the GNU General Public
    License.
-   
+
    If you submit changes to SANE to the maintainers to be included in
    a subsequent release, you agree by submitting the changes that
    those changes may be distributed with this exception intact.
-   
+
    If you write modifications of your own for SANE, it is your choice
    whether to permit this exception to apply to your modifications.
-   If you do not wish that, delete this exception notice. 
+   If you do not wish that, delete this exception notice.
 */
 
 #ifndef GT68XX_LOW_H
@@ -112,6 +112,9 @@
 #define GT68XX_FLAG_SHEET_FED       (1 << 12)	/* we have a sheet fed scanner */
 #define GT68XX_FLAG_HAS_CALIBRATE   (1 << 13)	/* for sheet fed scanners that be calibrated with
                                                    an calibration sheet */
+#define GT68XX_FLAG_NO_CALIBRATE   (1 << 14)	/* don't calibrate, because calibration is broken */
+
+
 
 /* Forward typedefs */
 typedef struct GT68xx_USB_Device_Entry GT68xx_USB_Device_Entry;
@@ -162,7 +165,7 @@ struct GT68xx_USB_Device_Entry
 
 /** List of all supported devices.
  *
- * This is an array of GT68xx_USB_Device_Entry structures which describe 
+ * This is an array of GT68xx_USB_Device_Entry structures which describe
  * USB devices supported by this backend.  The array is terminated by an
  * entry with model = NULL.
  *
@@ -319,7 +322,7 @@ struct GT68xx_Command_Set
     SANE_Status (*lamp_control) (GT68xx_Device * dev, SANE_Bool fb_lamp,
 				 SANE_Bool ta_lamp);
 
-  /** Check whether the scanner carriage is still moving. 
+  /** Check whether the scanner carriage is still moving.
    *
    * @param dev Device object.
    * @param moving Returned state of the scanner:
@@ -400,7 +403,7 @@ struct GT68xx_Command_Set
   /** Detect if a document is inserted in the feeder
    *
    * @param dev Device object.
-   * @param present 
+   * @param present
    */
     SANE_Status (*document_present) (GT68xx_Device * dev,
 			             SANE_Bool *present);
@@ -564,7 +567,7 @@ struct GT68xx_Scan_Request
  *
  * These parameters describe a low-level scan request; many such requests are
  * executed during calibration, and they need to have parameters separate from
- * the main request (GT68xx_Scan_Request).  
+ * the main request (GT68xx_Scan_Request).
  */
 struct GT68xx_Scan_Parameters
 {
@@ -883,7 +886,7 @@ static SANE_Status
 gt68xx_device_lamp_control (GT68xx_Device * dev, SANE_Bool fb_lamp,
 			    SANE_Bool ta_lamp);
 
-/** Check whether the scanner carriage is still moving. 
+/** Check whether the scanner carriage is still moving.
  *
  * @param dev Device object.
  * @param moving Returned state of the scanner:
@@ -1067,7 +1070,7 @@ static SANE_Status gt68xx_device_read_finish (GT68xx_Device * dev);
  *
  * @param res Result packet from the last command
  * @param command Command
- * 
+ *
  * @return
  * - #SANE_STATUS_GOOD - success.
  * - #SANE_STATUS_IO_ERROR - the command wasn't successful
@@ -1076,7 +1079,7 @@ static SANE_Status
 gt68xx_device_check_result (GT68xx_Packet res, SANE_Byte command);
 
 
-static SANE_Status 
+static SANE_Status
 gt68xx_device_get_id (GT68xx_Device * dev);
 
 /** Read the device descriptor of the scanner.
@@ -1088,7 +1091,7 @@ gt68xx_device_get_id (GT68xx_Device * dev);
  *
  * @param dev device
 */
-static void 
+static void
 gt68xx_device_fix_descriptor (GT68xx_Device * dev);
 
 #endif /* not GT68XX_LOW_H */