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

1 files changed, 60 insertions, 11 deletions

diff --git a/backend/gt68xx_devices.c b/backend/gt68xx_devices.c
index 1239190..2df24f6 100644
--- a/backend/gt68xx_devices.c
+++ b/backend/gt68xx_devices.c
@@ -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.
 */
 
 /* Scanner-specific data */
@@ -406,7 +406,7 @@ static GT68xx_Model mustek_2448taplus_model = {
 
   SANE_FALSE,			/* Is this a CIS scanner? */
   GT68XX_FLAG_NO_STOP		/* Which flags are needed for this scanner? */
-    /* Based on data from Jakub Dvo?ák <xdvorak@chello.cz>. */
+    /* Based on data from Jakub Dvořák <xdvorak@chello.cz>. */
 };
 
 static GT68xx_Model mustek_1200ta_model = {
@@ -805,6 +805,54 @@ static GT68xx_Model artec_ultima2000_model = {
     /* Setup for Cytron TCM MD 9385 */
 };
 
+static GT68xx_Model plustek_opticslim500plus_model = {
+  "plustek-opticslim-500plus",	/* Name */
+  "Plustek",			/* Device vendor string */
+  "OpticSlim 500 Plus",		/* Device model name */
+  "cis3R5B1.fw",		/* Name of the firmware file */
+  SANE_FALSE,			/* Dynamic allocation flag */
+
+  &mustek_gt6816_command_set,	/* Command set used by this scanner */
+
+  600,				/* maximum optical sensor resolution */
+  1200,				/* maximum motor resolution */
+  600,				/* base x-res used to calculate geometry */
+  600,				/* base y-res used to calculate geometry */
+  1200,				/* if ydpi is equal or higher, disable backtracking */
+  SANE_FALSE,			/* Use base_ydpi for all resolutions */
+
+  {600, 300, 150, 75, 50, 0},	/* possible x-resolutions */
+  {1200, 600, 300, 150, 75, 50, 0},/* possible y-resolutions */
+  {16, 8, 0},			/* possible depths in gray mode */
+  {16, 8, 0},			/* possible depths in color mode */
+
+  SANE_FIX (1.0),		/* Start of scan area in mm  (x) */
+  SANE_FIX (9.5),		/* Start of scan area in mm (y) */
+  SANE_FIX (218.0),		/* Size of scan area in mm (x) */
+  SANE_FIX (142.0),		/* Size of scan area in mm (y) */
+
+  SANE_FIX (0.0),		/* Start of white strip in mm (y) */
+  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+
+  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+
+  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+
+  0, 0, 0,			/* RGB CCD Line-distance correction in pixel */
+  0,				/* CCD distcance for CCD with 6 lines) */
+
+  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  {0x32, 0x02, 0x26, 0x07, 0x26, 0x09},	/* Default offset/gain */
+  {0x127, 0x127, 0x127},	/* Default exposure parameters */
+  SANE_FIX (1.5),		/* Default gamma value */
+
+  SANE_TRUE,			/* Is this a CIS scanner? */
+  GT68XX_FLAG_NO_CALIBRATE	/* Which flags are needed for this scanner? */
+};
+
 static GT68xx_Model mustek_2400cu_model = {
   "mustek-bearpaw-2400-cu",	/* Name */
   "Mustek",			/* Device vendor string */
@@ -1930,6 +1978,7 @@ static GT68xx_USB_Device_Entry gt68xx_usb_device_list[] = {
   {0x07b3, 0x040b, &plustek_ops12_model},
   {0x07b3, 0x040e, &plustek_ops24_model},
   {0x07b3, 0x0412, &plustek_opticslim_m12_model},
+  {0x07b3, 0x046e, &plustek_opticslim500plus_model},
   {0x07b3, 0x0413, &plustek_opticslim1200_model},
   {0x07b3, 0x0422, &plustek_opticslim2400_model},
   {0x07b3, 0x045f, &iriscan_express_2_model},