kopia lustrzana https://gitlab.com/sane-project/backends
Removed some warnings. Fixed segfault while exiting. Using empty
devicename works now. New version: 1.0-10. Henning Meier-Geinitz <henning@meier-geinitz.de>DEVEL_2_0_BRANCH-1
Henning Geinitz
rodzic
ae6332e34d
commit
062cefe068
|
|
@ -46,7 +46,7 @@
|
|||
This file implements a SANE backend for Mustek 1200UB and similar
|
||||
flatbed scanners. */
|
||||
|
||||
#define BUILD 9
|
||||
#define BUILD 10
|
||||
|
||||
#include "../include/sane/config.h"
|
||||
|
||||
|
|
@ -917,10 +917,13 @@ sane_exit (void)
|
|||
for (dev = first_dev; dev; dev = next)
|
||||
{
|
||||
next = dev->next;
|
||||
status = usb_high_scan_exit (dev);
|
||||
if (status != SANE_STATUS_GOOD)
|
||||
DBG (3, "sane_exit: while closing %s, usb_high_scan_exit returned: "
|
||||
"%s\n", dev->name, sane_strstatus (status));
|
||||
if (dev->chip)
|
||||
{
|
||||
status = usb_high_scan_exit (dev);
|
||||
if (status != SANE_STATUS_GOOD)
|
||||
DBG (3, "sane_exit: while closing %s, usb_high_scan_exit returned: "
|
||||
"%s\n", dev->name, sane_strstatus (status));
|
||||
}
|
||||
free ((void *) dev->name);
|
||||
free (dev);
|
||||
}
|
||||
|
|
@ -964,7 +967,7 @@ sane_open (SANE_String_Const devicename, SANE_Handle * handle)
|
|||
Mustek_Usb_Scanner *s;
|
||||
SANE_Int value;
|
||||
|
||||
DBG (5, "sane_open: start\n");
|
||||
DBG (5, "sane_open: start (devicename = `%s')\n", devicename);
|
||||
|
||||
if (devicename[0])
|
||||
{
|
||||
|
|
@ -974,12 +977,19 @@ sane_open (SANE_String_Const devicename, SANE_Handle * handle)
|
|||
|
||||
if (!dev)
|
||||
{
|
||||
DBG (5, "sane_open: couldn't find `%s' in devlist, trying attach)\n",
|
||||
devicename);
|
||||
RIE(attach (devicename, &dev, SANE_TRUE));
|
||||
}
|
||||
else
|
||||
DBG (5, "sane_open: found `%s' in devlist\n", dev->name);
|
||||
}
|
||||
else
|
||||
/* empty devicname -> use first device */
|
||||
dev = first_dev;
|
||||
{
|
||||
/* empty devicname -> use first device */
|
||||
dev = first_dev;
|
||||
DBG (5, "sane_open: empty devicename, trying `%s'\n", dev->name);
|
||||
}
|
||||
|
||||
if (!dev)
|
||||
return SANE_STATUS_INVAL;
|
||||
|
|
@ -1003,7 +1013,7 @@ sane_open (SANE_String_Const devicename, SANE_Handle * handle)
|
|||
first_handle = s;
|
||||
|
||||
*handle = s;
|
||||
strcpy (s->hw->device_name, devicename);
|
||||
strcpy (s->hw->device_name, dev->name);
|
||||
|
||||
RIE(usb_high_scan_turn_power (s->hw, SANE_TRUE));
|
||||
RIE(usb_high_scan_back_home (s->hw));
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
:backend "mustek_usb"
|
||||
:status :beta
|
||||
:version "1.0-9"
|
||||
:version "1.0-10"
|
||||
:manpage "sane-mustek_usb"
|
||||
:url "http://www.meier-geinitz.de/sane/"
|
||||
|
||||
|
|
|
|||
|
|
@ -859,6 +859,12 @@ usb_high_scan_exit (Mustek_Usb_Device * dev)
|
|||
SANE_Status status;
|
||||
|
||||
DBG (5, "usb_high_scan_exit: start\n");
|
||||
if (!dev->chip)
|
||||
{
|
||||
DBG (5, "usb_high_scan_exit: already exited (`%s')\n", dev->name);
|
||||
return SANE_STATUS_INVAL;
|
||||
}
|
||||
|
||||
RIE(usb_low_exit (dev->chip));
|
||||
dev->chip = 0;
|
||||
DBG (5, "usb_high_scan_exit: exit\n");
|
||||
|
|
@ -1926,6 +1932,7 @@ usb_high_scan_adjust_mono_600_exposure (Mustek_Usb_Device * dev)
|
|||
return SANE_STATUS_GOOD;
|
||||
}
|
||||
|
||||
#if 0
|
||||
/* CCD */
|
||||
SANE_Status
|
||||
usb_high_scan_adjust_mono_600_offset (Mustek_Usb_Device * dev)
|
||||
|
|
@ -1942,7 +1949,7 @@ usb_high_scan_adjust_mono_600_offset (Mustek_Usb_Device * dev)
|
|||
SANE_Status
|
||||
usb_high_scan_adjust_mono_600_pga (Mustek_Usb_Device * dev)
|
||||
{
|
||||
DBG (5, "usb_high_scan_adjust_mono_600_pga: start\n");
|
||||
DBG (5, "usb_high_scan_adjust_mono_600_pga: start (dev = %p)\n", dev);
|
||||
DBG (5, "usb_high_scan_adjust_mono_600_pga: exit\n");
|
||||
return SANE_STATUS_GOOD;
|
||||
}
|
||||
|
|
@ -1951,10 +1958,12 @@ usb_high_scan_adjust_mono_600_pga (Mustek_Usb_Device * dev)
|
|||
SANE_Status
|
||||
usb_high_scan_adjust_mono_600_skips_per_row (Mustek_Usb_Device * dev)
|
||||
{
|
||||
DBG (5, "usb_high_scan_adjust_mono_600_skips_per_row: start\n");
|
||||
DBG (5, "usb_high_scan_adjust_mono_600_skips_per_row: start (dev = %p)\n",
|
||||
dev);
|
||||
DBG (5, "usb_high_scan_adjust_mono_600_skips_per_row: exit\n");
|
||||
return SANE_STATUS_GOOD;
|
||||
}
|
||||
#endif
|
||||
|
||||
SANE_Status
|
||||
usb_high_scan_adjust_rgb_300_power_delay (Mustek_Usb_Device * dev)
|
||||
|
|
|
|||
|
|
@ -311,7 +311,7 @@ typedef struct Mustek_Usb_Device
|
|||
SANE_Byte threshold;
|
||||
SANE_Word * gamma_table;
|
||||
SANE_Word skips_per_row;
|
||||
|
||||
|
||||
/* CCD */
|
||||
SANE_Bool is_adjusted_mono_600_offset;
|
||||
SANE_Bool is_adjusted_mono_600_exposure;
|
||||
|
|
@ -567,6 +567,8 @@ usb_high_scan_adjust_mono_600_power_delay (Mustek_Usb_Device * dev);
|
|||
static SANE_Status
|
||||
usb_high_scan_adjust_mono_600_exposure (Mustek_Usb_Device * dev);
|
||||
|
||||
#if 0
|
||||
/* CCD */
|
||||
static SANE_Status
|
||||
usb_high_scan_adjust_mono_600_offset (Mustek_Usb_Device * dev);
|
||||
|
||||
|
|
@ -575,6 +577,7 @@ usb_high_scan_adjust_mono_600_pga (Mustek_Usb_Device * dev);
|
|||
|
||||
static SANE_Status
|
||||
usb_high_scan_adjust_mono_600_skips_per_row (Mustek_Usb_Device * dev);
|
||||
#endif
|
||||
|
||||
static SANE_Status
|
||||
usb_high_scan_adjust_rgb_300_power_delay (Mustek_Usb_Device * dev);
|
||||
|
|
|
|||
|
|
@ -2618,15 +2618,17 @@ usb_mid_front_set_blue_offset (ma1017 * chip, SANE_Byte offset)
|
|||
return SANE_STATUS_GOOD;
|
||||
}
|
||||
|
||||
#if 0
|
||||
/* CCD */
|
||||
SANE_Word
|
||||
usb_mid_frontend_max_offset_index (ma1017 * chip)
|
||||
{
|
||||
DBG (6, "usb_mid_front_max_offset_index: start\n");
|
||||
DBG (6, "usb_mid_front_max_offset_index: start (chip = %p)\n", chip);
|
||||
|
||||
DBG (6, "usb_mid_front_max_offset_index: exit\n");
|
||||
return OFFSET_TABLE_SIZE - 1;
|
||||
return (OFFSET_TABLE_SIZE - 1);
|
||||
}
|
||||
#endif
|
||||
|
||||
SANE_Status
|
||||
usb_mid_front_set_red_pga (ma1017 * chip, SANE_Byte pga)
|
||||
|
|
|
|||
|
|
@ -487,9 +487,11 @@ usb_mid_front_set_blue_pga (ma1017 * chip, SANE_Byte pga);
|
|||
static SANE_Status
|
||||
usb_mid_front_set_rgb_signal (ma1017 * chip);
|
||||
|
||||
#if 0
|
||||
/* CCD */
|
||||
static SANE_Word
|
||||
usb_mid_frontend_max_offset_index (ma1017 * chip);
|
||||
#define OFFSET_TABLE_SIZE 256;
|
||||
#define OFFSET_TABLE_SIZE 256
|
||||
#endif
|
||||
|
||||
#endif /* mustek_usb_mid_h */
|
||||
|
|
|
|||
|
|
@ -1,5 +1,18 @@
|
|||
CHANGES for the SANE Mustek USB backend
|
||||
|
||||
2002-01-11
|
||||
* Release of version 1.0-10.
|
||||
|
||||
2002-01-11
|
||||
* mustek_usb_high.(c|h), mustek_usb_mid.(c|h): commented out unused CCD code.
|
||||
* mustek_usb_mid.h: Fixed OFFSET_TABLE_SIZE.
|
||||
* mustek_usb.c: Fixed bug concerning opening with empty name.
|
||||
* mustek_usb.c, mustek_usb_high.c: Make sure usb_low_exit is only called once
|
||||
per device. Fixed segfault.
|
||||
|
||||
2002-01-10
|
||||
* mustek_usb.desc: Status is "beta" now.
|
||||
|
||||
2002-01-03
|
||||
* Added link to plustek to manual page.
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: sane-backends 1.0.7\n"
|
||||
"POT-Creation-Date: 2002-01-08 20:40+0100\n"
|
||||
"POT-Creation-Date: 2002-01-11 23:23+0100\n"
|
||||
"PO-Revision-Date: 2002-01-10 0:11 CEST\n"
|
||||
"Last-Translator: Henning Meier-Geinitz <henning@meier-geinitz.de>\n"
|
||||
"Language-Team:\n"
|
||||
|
|
@ -398,7 +398,9 @@ msgid ""
|
|||
"Gamma-correction table. In color mode this option equally affects the red, "
|
||||
"green, and blue channels simultaneously (i.e., it is an intensity gamma "
|
||||
"table)."
|
||||
msgstr "Gammatabelle. Im Farbmodus wirkt sich diese Option auf alle Farbkomponenten aus.\""
|
||||
msgstr ""
|
||||
"Gammatabelle. Im Farbmodus wirkt sich diese Option auf alle Farbkomponenten "
|
||||
"aus.\""
|
||||
|
||||
#: .tmp/saneopts.h:237
|
||||
msgid "Gamma-correction table for the red band."
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue