config.h   config.h 
skipping to change at line 50 skipping to change at line 50
/* Define if the system does not provide POSIX.1 features except /* Define if the system does not provide POSIX.1 features except
with this defined. */ with this defined. */
/* #undef _POSIX_1_SOURCE */ /* #undef _POSIX_1_SOURCE */
/* Define if you need to in order for stat and other things to work. */ /* Define if you need to in order for stat and other things to work. */
/* #undef _POSIX_SOURCE */ /* #undef _POSIX_SOURCE */
/* Define to `unsigned' if <sys/types.h> doesn't define. */ /* Define to `unsigned' if <sys/types.h> doesn't define. */
/* #undef size_t */ /* #undef size_t */
/* Define to `unsigned char' if <sys/types.h> doesn't define. */
/* #undef u_char */
/* Define to `unsigned int' if <sys/types.h> doesn't define. */
/* #undef u_int */
/* Define to `unsigned long' if <sys/types.h> doesn't define. */
/* #undef u_long */
/* Define to `long' if <sys/types.h> doesn't define. */ /* Define to `long' if <sys/types.h> doesn't define. */
/* #undef ssize_t */ /* #undef ssize_t */
/* Define to `int' if <sys/types.h> doesn't define. */ /* Define to `int' if <sys/types.h> doesn't define. */
/* #undef pid_t */ /* #undef pid_t */
/* Define scsireq_t as `struct scsireq' if necessary. */ /* Define scsireq_t as `struct scsireq' if necessary. */
/* #undef scsireq_t */ /* #undef scsireq_t */
/* Define to the return type of signal handlers. */ /* Define to the return type of signal handlers. */
skipping to change at line 93 skipping to change at line 102
/* Define if your locale.h file contains LC_MESSAGES. */ /* Define if your locale.h file contains LC_MESSAGES. */
/* #undef HAVE_LC_MESSAGES */ /* #undef HAVE_LC_MESSAGES */
/* Define to 1 if you have the stpcpy function. */ /* Define to 1 if you have the stpcpy function. */
/* #undef HAVE_STPCPY */ /* #undef HAVE_STPCPY */
/* Define to the name of the distribution. */ /* Define to the name of the distribution. */
#define PACKAGE "sane" #define PACKAGE "sane"
/* The concatenation of the strings PACKAGE, "-", and VERSION. */ /* The concatenation of the strings PACKAGE, "-", and VERSION. */
#define PACKAGE_VERSION "sane-0.69" #define PACKAGE_VERSION "sane-1.0.1"
/* Define to the version of the distribution. */ /* Define to the version of the distribution. */
#define VERSION "0.69" #define VERSION "1.0.1"
/* Define if you have the __argz_count function. */ /* Define if you have the __argz_count function. */
/* #undef HAVE___ARGZ_COUNT */ /* #undef HAVE___ARGZ_COUNT */
/* Define if you have the __argz_next function. */ /* Define if you have the __argz_next function. */
/* #undef HAVE___ARGZ_NEXT */ /* #undef HAVE___ARGZ_NEXT */
/* Define if you have the __argz_stringify function. */ /* Define if you have the __argz_stringify function. */
/* #undef HAVE___ARGZ_STRINGIFY */ /* #undef HAVE___ARGZ_STRINGIFY */
skipping to change at line 147 skipping to change at line 156
/* Define if you have the setenv function. */ /* Define if you have the setenv function. */
/* #undef HAVE_SETENV */ /* #undef HAVE_SETENV */
/* Define if you have the setlocale function. */ /* Define if you have the setlocale function. */
/* #undef HAVE_SETLOCALE */ /* #undef HAVE_SETLOCALE */
/* Define if you have the stpcpy function. */ /* Define if you have the stpcpy function. */
/* #undef HAVE_STPCPY */ /* #undef HAVE_STPCPY */
/* Define if you have the strcasecmp function. */ /* Define if you have the strcasecmp function. */
/* #undef HAVE_STRCASECMP */ #define HAVE_STRCASECMP 1
/* Define if you have the strchr function. */ /* Define if you have the strchr function. */
/* #undef HAVE_STRCHR */ /* #undef HAVE_STRCHR */
/* Define if you have the strdup function. */ /* Define if you have the strdup function. */
#define HAVE_STRDUP 1 #define HAVE_STRDUP 1
/* Define if you have the strncasecmp function. */ /* Define if you have the strncasecmp function. */
#define HAVE_STRNCASECMP 1 #define HAVE_STRNCASECMP 1
skipping to change at line 179 skipping to change at line 188
/* Define if you have the strtod function. */ /* Define if you have the strtod function. */
#define HAVE_STRTOD 1 #define HAVE_STRTOD 1
/* Define if you have the valloc function. */ /* Define if you have the valloc function. */
/* #undef HAVE_VALLOC */ /* #undef HAVE_VALLOC */
/* Define if you have the snprintf function. */ /* Define if you have the snprintf function. */
#define HAVE_SNPRINTF 1 #define HAVE_SNPRINTF 1
/* Define if you have the usleep function. */ /* Ignore HAVE_USLEEP under Apollo Domain because the usleep()
#define HAVE_USLEEP 1 implementation in the Sys5.3 environment is broken. */
#ifndef apollo
/* Define if you have the usleep function. */
# define HAVE_USLEEP 1
#endif
/* Define if you have the <argz.h> header file. */ /* Define if you have the <argz.h> header file. */
/* #undef HAVE_ARGZ_H */ /* #undef HAVE_ARGZ_H */
/* Define if you have the <fcntl.h> header file. */ /* Define if you have the <fcntl.h> header file. */
#define HAVE_FCNTL_H 1 #define HAVE_FCNTL_H 1
/* Define if you have the <libintl.h> header file. */ /* Define if you have the <libintl.h> header file. */
#define HAVE_LIBINTL_H 1 #define HAVE_LIBINTL_H 1
skipping to change at line 212 skipping to change at line 225
/* Define if you have the <nl_types.h> header file. */ /* Define if you have the <nl_types.h> header file. */
/* #undef HAVE_NL_TYPES_H */ /* #undef HAVE_NL_TYPES_H */
/* Define if you have the <string.h> header file. */ /* Define if you have the <string.h> header file. */
/* #undef HAVE_STRING_H */ /* #undef HAVE_STRING_H */
/* Define if you have the <sys/select.h> header file. */ /* Define if you have the <sys/select.h> header file. */
#define HAVE_SYS_SELECT_H 1 #define HAVE_SYS_SELECT_H 1
/* Define if you have the <sys/time.h> header file. */
#define HAVE_SYS_TIME_H 1
/* Define if you have the <sys/io.h> header file. */ /* Define if you have the <sys/io.h> header file. */
#define HAVE_SYS_IO_H 1 #define HAVE_SYS_IO_H 1
/* Define if you have the <asm/io.h> header file. */ /* Define if you have the <asm/io.h> header file. */
/* #undef HAVE_ASM_IO_H */ /* #undef HAVE_ASM_IO_H */
/* Define if you have the <scsi.h> header file. */ /* Define if you have the <scsi.h> header file. */
/* #undef HAVE_SCSI_H */ /* #undef HAVE_SCSI_H */
/* Define if you have the <scsi/sg.h> header file. */ /* Define if you have the <scsi/sg.h> header file. */
skipping to change at line 233 skipping to change at line 249
/* Define if you have the "/usr/src/linux/include/scsi/sg.h" header file. * / /* Define if you have the "/usr/src/linux/include/scsi/sg.h" header file. * /
/* #undef HAVE__USR_SRC_LINUX_INCLUDE_SCSI_SG_H */ /* #undef HAVE__USR_SRC_LINUX_INCLUDE_SCSI_SG_H */
/* Define if you have the <sys/dsreq.h> header file. */ /* Define if you have the <sys/dsreq.h> header file. */
/* #undef HAVE_SYS_DSREQ_H */ /* #undef HAVE_SYS_DSREQ_H */
/* Define if you have the <sys/scsi.h> header file. */ /* Define if you have the <sys/scsi.h> header file. */
/* #undef HAVE_SYS_SCSI_H */ /* #undef HAVE_SYS_SCSI_H */
/* Define if you have the <sys/scsi/targets/scgio.h> header file. */
/* #undef HAVE_SYS_SCSI_TARGETS_SCGIO_H */
/* Define if you have the <sys/scsi/sgdefs.h> header file. */
/* #undef HAVE_SYS_SCSI_SGDEFS_H */
/* Define if you have the <sys/scsicmd.h> header file. */ /* Define if you have the <sys/scsicmd.h> header file. */
/* #undef HAVE_SYS_SCSICMD_H */ /* #undef HAVE_SYS_SCSICMD_H */
/* Define if you have the <sys/scsiio.h> header file. */ /* Define if you have the <sys/scsiio.h> header file. */
/* #undef HAVE_SYS_SCSIIO_H */ /* #undef HAVE_SYS_SCSIIO_H */
/* Define if you have the <sys/scanio.h> header file. */ /* Define if you have the <sys/scanio.h> header file. */
/* #undef HAVE_SYS_SCANIO_H */ /* #undef HAVE_SYS_SCANIO_H */
/* Define if you have the <apollo/scsi.h> header file. */
/* #undef HAVE_APOLLO_SCSI_H */
/* Define if you have the <bsd/dev/scsireg.h> header file. */ /* Define if you have the <bsd/dev/scsireg.h> header file. */
/* #undef HAVE_BSD_DEV_SCSIREG_H */ /* #undef HAVE_BSD_DEV_SCSIREG_H */
/* Define if you have the <io/cam/cam.h> header file. */ /* Define if you have the <io/cam/cam.h> header file. */
/* #undef HAVE_IO_CAM_CAM_H */ /* #undef HAVE_IO_CAM_CAM_H */
/* Define if you have the <camlib.h> header file. */
/* #undef HAVE_CAMLIB_H */
/* Define if you have the <gscdds.h> header file. */ /* Define if you have the <gscdds.h> header file. */
/* #undef HAVE_GSCDDS_H */ /* #undef HAVE_GSCDDS_H */
/* Define if you have the <os2.h> header file. */ /* Define if you have the <os2.h> header file. */
/* #undef HAVE_OS2_H */ /* #undef HAVE_OS2_H */
/* Define if you have EMX's sys/hw.h headers. */
/* #undef HAVE_SYS_HW_H */
/* Define if you have sys/types.h. OS/2 wants them before select.h, etc. */
#define HAVE_SYS_TYPES_H 1
/* Define if you have the <unistd.h> header file. */ /* Define if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1 #define HAVE_UNISTD_H 1
/* Define if you have the <values.h> header file. */ /* Define if you have the <values.h> header file. */
/* #undef HAVE_VALUES_H */ /* #undef HAVE_VALUES_H */
/* Define if you have the i library (-li). */ /* Define if you have the i library (-li). */
/* #undef HAVE_LIBI */ /* #undef HAVE_LIBI */
/* Define if you have the intl library (-lintl). */ /* Define if you have the intl library (-lintl). */
skipping to change at line 275 skipping to change at line 309
/* Define if you have the m library (-lm). */ /* Define if you have the m library (-lm). */
#define HAVE_LIBM 1 #define HAVE_LIBM 1
/* Define if you have the <dlfcn.h> header file. */ /* Define if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1 #define HAVE_DLFCN_H 1
/* Define if you have the dlopen function. */ /* Define if you have the dlopen function. */
#define HAVE_DLOPEN 1 #define HAVE_DLOPEN 1
/* Define if you have the <dl.h> header file. */
/* #undef HAVE_DL_H */
/* Define if you have the shl_load function. */
/* #undef HAVE_SHL_LOAD */
/* Define if you have the GIMP header files and library. */ /* Define if you have the GIMP header files and library. */
/* #undef HAVE_LIBGIMP_GIMP_H */ /* #undef HAVE_LIBGIMP_GIMP_H */
/* Define if you have gtk version 0.99.3 or earlier. */
/* #undef HAVE_GTK_TOOLTIPS_SET_TIPS */
/* Define if you have the POSIX routine tcsendbreak(). */
#define HAVE_TCSENDBREAK 1
#ifndef HAVE_STRNCASECMP #ifndef HAVE_STRNCASECMP
/* OS/2 needs this */ /* OS/2 needs this */
# define strncasecmp(a, b, c) strnicmp(a, b, c) # define strncasecmp(a, b, c) strnicmp(a, b, c)
#endif #endif
#ifndef HAVE_STRCASECMP
/* OS/2 needs this */
# define strcasecmp(a, b) stricmp(a, b)
#endif
#ifndef HAVE_STRDUP
/* declare return type to avoid compile errors on 64-bit platforms */
extern char *strdup ();
#endif
#ifndef HAVE_STRNDUP
/* declare return type to avoid compile errors on 64-bit platforms */
extern char *strndup ();
#endif
#ifndef HAVE_STRSEP
/* declare return type to avoid compile errors on 64-bit platforms */
extern char *strsep ();
#endif
#if defined (__sun) && defined (__GNUC__) #if defined (__sun) && defined (__GNUC__)
# define _POSIX_SOURCE # define _POSIX_SOURCE
# define __EXTENSIONS__ # define __EXTENSIONS__
#endif #endif
#endif /* SANE_CONFIG_H */ #endif /* SANE_CONFIG_H */
 End of changes. 13 change blocks. 
5 lines changed or deleted 71 lines changed or added


 sane.h   sane.h 
/* sane - Scanner Access Now Easy. /* sane - Scanner Access Now Easy.
Copyright (C) 1997 David Mosberger-Tang and Andreas Beck Copyright (C) 1997-1999 David Mosberger-Tang and Andreas Beck
This file is part of the SANE package. This file is part of the SANE package.
This file is in the public domain. You may use and modify it as This file is in the public domain. You may use and modify it as
you see fit, as long as this copyright message is included and you see fit, as long as this copyright message is included and
that there is an indication as to what modifications have been that there is an indication as to what modifications have been
made (if any). made (if any).
SANE is distributed in the hope that it will be useful, but WITHOUT SANE is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. FITNESS FOR A PARTICULAR PURPOSE.
This file declares SANE application interface. See the SANE This file declares SANE application interface. See the SANE
standard for a detailed explanation of the interface. */ standard for a detailed explanation of the interface. */
#ifndef sane_h #ifndef sane_h
#define sane_h #define sane_h
#define SANE_CURRENT_MAJOR 0 #define SANE_CURRENT_MAJOR 1
#define SANE_VERSION_CODE(major, minor, build) \ #define SANE_VERSION_CODE(major, minor, build) \
( (((SANE_Word) (major) & 0xff) << 24) \ ( (((SANE_Word) (major) & 0xff) << 24) \
| (((SANE_Word) (minor) & 0xff) << 16) \ | (((SANE_Word) (minor) & 0xff) << 16) \
| (((SANE_Word) (build) & 0xffff) << 0)) | (((SANE_Word) (build) & 0xffff) << 0))
#define SANE_VERSION_MAJOR(code) ((((SANE_Word)(code)) >> 24) & 0xf f) #define SANE_VERSION_MAJOR(code) ((((SANE_Word)(code)) >> 24) & 0xf f)
#define SANE_VERSION_MINOR(code) ((((SANE_Word)(code)) >> 16) & 0xf f) #define SANE_VERSION_MINOR(code) ((((SANE_Word)(code)) >> 16) & 0xf f)
#define SANE_VERSION_BUILD(code) ((((SANE_Word)(code)) >> 0) & 0xfff f) #define SANE_VERSION_BUILD(code) ((((SANE_Word)(code)) >> 0) & 0xfff f)
skipping to change at line 82 skipping to change at line 82
} }
SANE_Value_Type; SANE_Value_Type;
typedef enum typedef enum
{ {
SANE_UNIT_NONE = 0, /* the value is unit-less (e.g., # o f scans) */ SANE_UNIT_NONE = 0, /* the value is unit-less (e.g., # o f scans) */
SANE_UNIT_PIXEL, /* value is number of pixels */ SANE_UNIT_PIXEL, /* value is number of pixels */
SANE_UNIT_BIT, /* value is number of bits */ SANE_UNIT_BIT, /* value is number of bits */
SANE_UNIT_MM, /* value is millimeters */ SANE_UNIT_MM, /* value is millimeters */
SANE_UNIT_DPI, /* value is resolution in dots/inch */ SANE_UNIT_DPI, /* value is resolution in dots/inch */
SANE_UNIT_PERCENT /* value is a percentage */ SANE_UNIT_PERCENT, /* value is a percentage */
SANE_UNIT_MICROSECOND /* value is micro seconds */
} }
SANE_Unit; SANE_Unit;
typedef struct typedef struct
{ {
SANE_String_Const name; /* unique device name */ SANE_String_Const name; /* unique device name */
SANE_String_Const vendor; /* device vendor string */ SANE_String_Const vendor; /* device vendor string */
SANE_String_Const model; /* device model name */ SANE_String_Const model; /* device model name */
SANE_String_Const type; /* device type (e.g., "flatbed scanner") */ SANE_String_Const type; /* device type (e.g., "flatbed scanner") */
} }
 End of changes. 3 change blocks. 
3 lines changed or deleted 4 lines changed or added


 sanei_backend.h   sanei_backend.h 
#include <sane/sanei_debug.h> #include <sane/sanei_debug.h>
#ifdef HAVE_SYS_HW_H
/* OS/2 i/o-port access compatibility macros: */
# define inb(p) _inp8 (p)
# define outb(v,p) _outp8 ((p),(v))
# define ioperm(b,l,o) _portaccess ((b),(b)+(l)-1)
# define HAVE_IOPERM 1
#endif
#ifndef O_NONBLOCK #ifndef O_NONBLOCK
# ifdef O_NDELAY # ifdef O_NDELAY
# define O_NONBLOCK O_NDELAY # define O_NONBLOCK O_NDELAY
# else # else
# define O_NONBLOCK FNDELAY /* last resort */ # define O_NONBLOCK FNDELAY /* last resort */
# endif # endif
#endif #endif
#ifndef __GLIBC__ #ifndef __GLIBC__
# ifndef u_int8_t # ifndef u_int8_t
 End of changes. 1 change blocks. 
0 lines changed or deleted 8 lines changed or added


 sanei_debug.h   sanei_debug.h 
skipping to change at line 26 skipping to change at line 26
# define DBG_INIT(backend, var) # define DBG_INIT(backend, var)
# ifdef HAVE_VARARG_MACROS # ifdef HAVE_VARARG_MACROS
# define DBG(level, msg, args...) # define DBG(level, msg, args...)
# else # else
# define DBG if (0) sanei_debug # define DBG if (0) sanei_debug
# endif # endif
# define IF_DBG(x) # define IF_DBG(x)
#else #else
# include <stdio.h> # include <stdio.h>
#define DBG_LEVEL PASTE(sanei_debug_,BACKEND_NAME)
#if defined(BACKEND_NAME) && !defined(STUBS)
int PASTE(sanei_debug_,BACKEND_NAME); int PASTE(sanei_debug_,BACKEND_NAME);
#endif
# define DBG_INIT() \ # define DBG_INIT() \
sanei_init_debug (STRINGIFY(BACKEND_NAME), \ sanei_init_debug (STRINGIFY(BACKEND_NAME), \
&PASTE(sanei_debug_,BACKEND_NAME)) &PASTE(sanei_debug_,BACKEND_NAME))
/* The cpp that comes with GNU C 2.5 seems to have troubles understanding /* The cpp that comes with GNU C 2.5 seems to have troubles understanding
vararg macros. */ vararg macros. */
#ifdef HAVE_VARARG_MACROS #ifdef HAVE_VARARG_MACROS
# define DBG(level, msg, args...) \ # define DBG(level, msg, args...) \
do { \ do { \
if (PASTE(sanei_debug_,BACKEND_NAME) >= (level)) \ if (DBG_LEVEL >= (level)) \
fprintf (stderr, "[" STRINGIFY(BACKEND_NAME) "] " msg, ##args); \ fprintf (stderr, "[" STRINGIFY(BACKEND_NAME) "] " msg, ##args); \
} while (0) } while (0)
extern void sanei_init_debug (const char * backend, int * debug_level_var ); extern void sanei_init_debug (const char * backend, int * debug_level_var );
#else #else
# define DBG sanei_debug # define DBG sanei_debug
#endif #endif
# define IF_DBG(x) x # define IF_DBG(x) x
#endif #endif
 End of changes. 3 change blocks. 
1 lines changed or deleted 5 lines changed or added


 sanei_net.h   sanei_net.h 
/* sane - Scanner Access Now Easy. /* sane - Scanner Access Now Easy.
Copyright (C) 1997 David Mosberger-Tang Copyright (C) 1997-1999 David Mosberger-Tang and Andreas Beck
This file is part of the SANE package. This file is part of the SANE package.
SANE is free software; you can redistribute it and/or modify it This file is in the public domain. You may use and modify it as
under the terms of the GNU General Public License as published by you see fit, as long as this copyright message is included and
the Free Software Foundation; either version 2 of the License, or that there is an indication as to what modifications have been
(at your option) any later version. made (if any).
SANE is distributed in the hope that it will be useful, but WITHOUT SANE is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public FITNESS FOR A PARTICULAR PURPOSE.
License for more details.
You should have received a copy of the GNU General Public License
along with sane; see the file COPYING. If not, write to the Free
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
Support routines for RPC communication between the net backend This file declares SANE application interface. See the SANE
and saned. */ standard for a detailed explanation of the interface. */
#ifndef sanei_net_h #ifndef sanei_net_h
#define sanei_net_h #define sanei_net_h
#include <sane/sane.h> #include <sane/sane.h>
#include <sane/sanei_wire.h> #include <sane/sanei_wire.h>
#define SANEI_NET_PROTOCOL_VERSION 2 #define SANEI_NET_PROTOCOL_VERSION 3
typedef enum typedef enum
{ {
SANE_NET_LITTLE_ENDIAN = 0x1234, SANE_NET_LITTLE_ENDIAN = 0x1234,
SANE_NET_BIG_ENDIAN = 0x4321 SANE_NET_BIG_ENDIAN = 0x4321
} }
SANE_Net_Byte_Order; SANE_Net_Byte_Order;
typedef enum typedef enum
{ {
 End of changes. 5 change blocks. 
15 lines changed or deleted 10 lines changed or added


 sanei_scsi.h   sanei_scsi.h 
skipping to change at line 34 skipping to change at line 34
#include <sys/types.h> #include <sys/types.h>
#include <sane/sane.h> #include <sane/sane.h>
typedef SANE_Status (*SANEI_SCSI_Sense_Handler) (int fd, typedef SANE_Status (*SANEI_SCSI_Sense_Handler) (int fd,
u_char *sense_buffer, u_char *sense_buffer,
void *arg); void *arg);
extern int sanei_scsi_max_request_size; extern int sanei_scsi_max_request_size;
/* Find each SCSI devices that matches the pattern specified by the
arguments. String arguments can be "omitted" by passing NULL,
integer arguments can be "omitted" by passing -1. Callback ATTACH
gets invoked once for each device. The DEV argument passed to this
callback is the real devicename.
Example: vendor="HP" model=NULL, type=NULL, bus=3, id=-1, lun=-1 would
attach all HP devices on SCSI bus 3. */
extern void sanei_scsi_find_devices (const char *vendor, const char *model,
const char *type,
int bus, int channel, int id, int lun,
SANE_Status (*attach) (const char *dev)
);
extern SANE_Status sanei_scsi_open (const char * device_name, int * fd, extern SANE_Status sanei_scsi_open (const char * device_name, int * fd,
SANEI_SCSI_Sense_Handler sense_handler, SANEI_SCSI_Sense_Handler sense_handler,
void *sense_arg); void *sense_arg);
/* One or more scsi commands can be enqueued by calling req_enter(). /* One or more scsi commands can be enqueued by calling req_enter().
SRC is the pointer to the SCSI command and associated write data SRC is the pointer to the SCSI command and associated write data
and SRC_SIZE is the length of the command and data. DST is a and SRC_SIZE is the length of the command and data. DST is a
pointer to a buffer in which data is returned (if any). It may be pointer to a buffer in which data is returned (if any). It may be
NULL if no data is returned by the command. On input *DST_SIZE is NULL if no data is returned by the command. On input *DST_SIZE is
the size of the buffer pointed to by DST, on exit, *DST_SIZE is set the size of the buffer pointed to by DST, on exit, *DST_SIZE is set
 End of changes. 1 change blocks. 
0 lines changed or deleted 14 lines changed or added


 sanei_wire.h   sanei_wire.h 
skipping to change at line 43 skipping to change at line 43
WireDirection; WireDirection;
struct Wire; struct Wire;
typedef void (*WireCodecFunc) (struct Wire *w, void *val_ptr); typedef void (*WireCodecFunc) (struct Wire *w, void *val_ptr);
typedef ssize_t (*WireReadFunc) (int fd, void * buf, size_t len); typedef ssize_t (*WireReadFunc) (int fd, void * buf, size_t len);
typedef ssize_t (*WireWriteFunc) (int fd, const void * buf, size_t len); typedef ssize_t (*WireWriteFunc) (int fd, const void * buf, size_t len);
typedef struct Wire typedef struct Wire
{ {
int version; /* protocol version in use */
WireDirection direction; WireDirection direction;
int status; int status;
struct struct
{ {
WireCodecFunc w_byte; WireCodecFunc w_byte;
WireCodecFunc w_char; WireCodecFunc w_char;
WireCodecFunc w_word; WireCodecFunc w_word;
WireCodecFunc w_string; WireCodecFunc w_string;
} }
codec; codec;
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 saneopts.h   saneopts.h 
skipping to change at line 45 skipping to change at line 45
/* Most user-interfaces will let the user specify the scan area as the /* Most user-interfaces will let the user specify the scan area as the
top-left corner and the width/height of the scan area. The reason top-left corner and the width/height of the scan area. The reason
the backend interface uses the top-left/bottom-right corner is so the backend interface uses the top-left/bottom-right corner is so
that the scan area values can be properly constraint independent of that the scan area values can be properly constraint independent of
any other option value. */ any other option value. */
#define SANE_NAME_SCAN_TL_X "tl-x" #define SANE_NAME_SCAN_TL_X "tl-x"
#define SANE_NAME_SCAN_TL_Y "tl-y" #define SANE_NAME_SCAN_TL_Y "tl-y"
#define SANE_NAME_SCAN_BR_X "br-x" #define SANE_NAME_SCAN_BR_X "br-x"
#define SANE_NAME_SCAN_BR_Y "br-y" #define SANE_NAME_SCAN_BR_Y "br-y"
#define SANE_NAME_SCAN_RESOLUTION "resolution" #define SANE_NAME_SCAN_RESOLUTION "resolution"
#define SANE_NAME_SCAN_X_RESOLUTION "resolution"
#define SANE_NAME_SCAN_Y_RESOLUTION "y-resolution"
#define SANE_NAME_CUSTOM_GAMMA "custom-gamma" #define SANE_NAME_CUSTOM_GAMMA "custom-gamma"
#define SANE_NAME_GAMMA_VECTOR "gamma-table" #define SANE_NAME_GAMMA_VECTOR "gamma-table"
#define SANE_NAME_GAMMA_VECTOR_R "red-gamma-table" #define SANE_NAME_GAMMA_VECTOR_R "red-gamma-table"
#define SANE_NAME_GAMMA_VECTOR_G "green-gamma-table" #define SANE_NAME_GAMMA_VECTOR_G "green-gamma-table"
#define SANE_NAME_GAMMA_VECTOR_B "blue-gamma-table" #define SANE_NAME_GAMMA_VECTOR_B "blue-gamma-table"
#define SANE_NAME_BRIGHTNESS "brightness" #define SANE_NAME_BRIGHTNESS "brightness"
#define SANE_NAME_CONTRAST "contrast" #define SANE_NAME_CONTRAST "contrast"
#define SANE_NAME_GRAIN_SIZE "grain" #define SANE_NAME_GRAIN_SIZE "grain"
#define SANE_NAME_HALFTONE "halftoning" #define SANE_NAME_HALFTONE "halftoning"
#define SANE_NAME_BLACK_LEVEL "black-level" #define SANE_NAME_BLACK_LEVEL "black-level"
#define SANE_NAME_WHITE_LEVEL "white-level" #define SANE_NAME_WHITE_LEVEL "white-level"
#define SANE_NAME_SHADOW "shadow"
#define SANE_NAME_SHADOW_R "shadow-r"
#define SANE_NAME_SHADOW_G "shadow-g"
#define SANE_NAME_SHADOW_B "shadow-b"
#define SANE_NAME_HIGHLIGHT "highlight"
#define SANE_NAME_HIGHLIGHT_R "highlight-r"
#define SANE_NAME_HIGHLIGHT_G "highlight-g"
#define SANE_NAME_HIGHLIGHT_B "highlight-b"
#define SANE_NAME_HUE "hue" #define SANE_NAME_HUE "hue"
#define SANE_NAME_SATURATION "saturation" #define SANE_NAME_SATURATION "saturation"
#define SANE_NAME_FILE "filename" #define SANE_NAME_FILE "filename"
#define SANE_NAME_HALFTONE_DIMENSION "halftone-size" #define SANE_NAME_HALFTONE_DIMENSION "halftone-size"
#define SANE_NAME_HALFTONE_PATTERN "halftone-pattern" #define SANE_NAME_HALFTONE_PATTERN "halftone-pattern"
#define SANE_NAME_RESOLUTION_BIND "resolution-bind" #define SANE_NAME_RESOLUTION_BIND "resolution-bind"
#define SANE_NAME_NEGATIVE "negative" #define SANE_NAME_NEGATIVE "negative"
#define SANE_NAME_QUALITY_CAL "quality-cal" #define SANE_NAME_QUALITY_CAL "quality-cal"
#define SANE_NAME_DOR "double-res"
#define SANE_NAME_RGB_BIND "rgb-bind"
#define SANE_NAME_THRESHOLD "threshold" #define SANE_NAME_THRESHOLD "threshold"
#define SANE_NAME_ANALOG_GAMMA "analog-gamma" #define SANE_NAME_ANALOG_GAMMA "analog-gamma"
#define SANE_NAME_ANALOG_GAMMA_R "analog-gamma-r" #define SANE_NAME_ANALOG_GAMMA_R "analog-gamma-r"
#define SANE_NAME_ANALOG_GAMMA_G "analog-gamma-g" #define SANE_NAME_ANALOG_GAMMA_G "analog-gamma-g"
#define SANE_NAME_ANALOG_GAMMA_B "analog-gamma-b" #define SANE_NAME_ANALOG_GAMMA_B "analog-gamma-b"
#define SANE_NAME_ANALOG_GAMMA_BIND "analog-gamma-bind" #define SANE_NAME_ANALOG_GAMMA_BIND "analog-gamma-bind"
#define SANE_NAME_SMEAR "smear" #define SANE_NAME_SMEAR "smear"
#define SANE_NAME_WHITE_BIND "white-bind"
#define SANE_NAME_BLACK_BIND "black-bind"
#define SANE_NAME_TEN_BIT_MODE "ten-bit-mode" #define SANE_NAME_TEN_BIT_MODE "ten-bit-mode"
#define SANE_NAME_TWELVE_BIT_MODE "twelve-bit-mode"
#define SANE_NAME_WARMUP "warmup" #define SANE_NAME_WARMUP "warmup"
#define SANE_NAME_RGB_PREVIEW_PATCH "preview-patch" #define SANE_NAME_RGB_PREVIEW_PATCH "preview-patch"
#define SANE_NAME_START_SCAN_PATCH "start-scan-patch" #define SANE_NAME_START_SCAN_PATCH "start-scan-patch"
#define SANE_NAME_CAL_EXPOS_TIME "cal-exposure-time"
#define SANE_NAME_CAL_EXPOS_TIME_R "cal-exposure-time-r"
#define SANE_NAME_CAL_EXPOS_TIME_G "cal-exposure-time-g"
#define SANE_NAME_CAL_EXPOS_TIME_B "cal-exposure-time-b"
#define SANE_NAME_SCAN_EXPOS_TIME "scan-exposure-time"
#define SANE_NAME_SCAN_EXPOS_TIME_R "scan-exposure-time-r"
#define SANE_NAME_SCAN_EXPOS_TIME_G "scan-exposure-time-g"
#define SANE_NAME_SCAN_EXPOS_TIME_B "scan-exposure-time-b"
#define SANE_NAME_SELECT_EXPOSURE_TIME "select-exposure-time"
#define SANE_NAME_CAL_LAMP_DEN "cal-lamp-density"
#define SANE_NAME_SCAN_LAMP_DEN "scan-lamp-density"
#define SANE_NAME_SELECT_LAMP_DENSITY "select-lamp-density"
#define SANE_TITLE_NUM_OPTIONS "Number of options" #define SANE_TITLE_NUM_OPTIONS "Number of options"
#define SANE_TITLE_PREVIEW "Preview" #define SANE_TITLE_PREVIEW "Preview"
#define SANE_TITLE_GRAY_PREVIEW "Force monochrome preview" #define SANE_TITLE_GRAY_PREVIEW "Force monochrome preview"
#define SANE_TITLE_BIT_DEPTH "Bit depth" #define SANE_TITLE_BIT_DEPTH "Bit depth"
#define SANE_TITLE_SCAN_MODE "Scan mode" #define SANE_TITLE_SCAN_MODE "Scan mode"
#define SANE_TITLE_SCAN_SPEED "Scan speed" #define SANE_TITLE_SCAN_SPEED "Scan speed"
#define SANE_TITLE_SCAN_SOURCE "Scan source" #define SANE_TITLE_SCAN_SOURCE "Scan source"
#define SANE_TITLE_BACKTRACK "Force backtracking" #define SANE_TITLE_BACKTRACK "Force backtracking"
#define SANE_TITLE_SCAN_TL_X "Top-left x" #define SANE_TITLE_SCAN_TL_X "Top-left x"
#define SANE_TITLE_SCAN_TL_Y "Top-left y" #define SANE_TITLE_SCAN_TL_Y "Top-left y"
#define SANE_TITLE_SCAN_BR_X "Bottom-right x" #define SANE_TITLE_SCAN_BR_X "Bottom-right x"
#define SANE_TITLE_SCAN_BR_Y "Bottom-right y" #define SANE_TITLE_SCAN_BR_Y "Bottom-right y"
#define SANE_TITLE_SCAN_RESOLUTION "Scan resolution" #define SANE_TITLE_SCAN_RESOLUTION "Scan resolution"
#define SANE_TITLE_SCAN_X_RESOLUTION "X-resolution"
#define SANE_TITLE_SCAN_Y_RESOLUTION "Y-resolution"
#define SANE_TITLE_CUSTOM_GAMMA "Use custom gamma table" #define SANE_TITLE_CUSTOM_GAMMA "Use custom gamma table"
#define SANE_TITLE_GAMMA_VECTOR "Image intensity" #define SANE_TITLE_GAMMA_VECTOR "Image intensity"
#define SANE_TITLE_GAMMA_VECTOR_R "Red intensity" #define SANE_TITLE_GAMMA_VECTOR_R "Red intensity"
#define SANE_TITLE_GAMMA_VECTOR_G "Green intensity" #define SANE_TITLE_GAMMA_VECTOR_G "Green intensity"
#define SANE_TITLE_GAMMA_VECTOR_B "Blue intensity" #define SANE_TITLE_GAMMA_VECTOR_B "Blue intensity"
#define SANE_TITLE_BRIGHTNESS "Brightness" #define SANE_TITLE_BRIGHTNESS "Brightness"
#define SANE_TITLE_CONTRAST "Contrast" #define SANE_TITLE_CONTRAST "Contrast"
#define SANE_TITLE_GRAIN_SIZE "Grain size" #define SANE_TITLE_GRAIN_SIZE "Grain size"
#define SANE_TITLE_HALFTONE "Halftoning" #define SANE_TITLE_HALFTONE "Halftoning"
#define SANE_TITLE_BLACK_LEVEL "Black level" #define SANE_TITLE_BLACK_LEVEL "Black level"
#define SANE_TITLE_WHITE_LEVEL "White level" #define SANE_TITLE_WHITE_LEVEL "White level"
#define SANE_TITLE_SHADOW "Shadow"
#define SANE_TITLE_SHADOW_R "Shadow for red"
#define SANE_TITLE_SHADOW_G "Shadow for green"
#define SANE_TITLE_SHADOW_B "Shadow for blue"
#define SANE_TITLE_HIGHLIGHT "Highlight"
#define SANE_TITLE_HIGHLIGHT_R "Highlight for red"
#define SANE_TITLE_HIGHLIGHT_G "Highlight for green"
#define SANE_TITLE_HIGHLIGHT_B "Highlight for blue"
#define SANE_TITLE_HUE "Hue" #define SANE_TITLE_HUE "Hue"
#define SANE_TITLE_SATURATION "Saturation" #define SANE_TITLE_SATURATION "Saturation"
#define SANE_TITLE_FILE "Filename" #define SANE_TITLE_FILE "Filename"
#define SANE_TITLE_HALFTONE_DIMENSION "Halftone pattern size" #define SANE_TITLE_HALFTONE_DIMENSION "Halftone pattern size"
#define SANE_TITLE_HALFTONE_PATTERN "Halftone pattern" #define SANE_TITLE_HALFTONE_PATTERN "Halftone pattern"
#define SANE_TITLE_RESOLUTION_BIND "Bind X and Y resolution" #define SANE_TITLE_RESOLUTION_BIND "Bind X and Y resolution"
#define SANE_TITLE_NEGATIVE "Negative" #define SANE_TITLE_NEGATIVE "Negative"
#define SANE_TITLE_QUALITY_CAL "Quality calibration" #define SANE_TITLE_QUALITY_CAL "Quality calibration"
#define SANE_TITLE_DOR "Double Optical Resolution"
#define SANE_TITLE_RGB_BIND "Bind RGB"
#define SANE_TITLE_THRESHOLD "Threshold" #define SANE_TITLE_THRESHOLD "Threshold"
#define SANE_TITLE_ANALOG_GAMMA "Analog gamma correction" #define SANE_TITLE_ANALOG_GAMMA "Analog gamma correction"
#define SANE_TITLE_ANALOG_GAMMA_R "Analog gamma red" #define SANE_TITLE_ANALOG_GAMMA_R "Analog gamma red"
#define SANE_TITLE_ANALOG_GAMMA_G "Analog gamma green" #define SANE_TITLE_ANALOG_GAMMA_G "Analog gamma green"
#define SANE_TITLE_ANALOG_GAMMA_B "Analog gamma blue" #define SANE_TITLE_ANALOG_GAMMA_B "Analog gamma blue"
#define SANE_TITLE_ANALOG_GAMMA_BIND "Bind analog gamma" #define SANE_TITLE_ANALOG_GAMMA_BIND "Bind analog gamma"
#define SANE_TITLE_SMEAR "Smear" #define SANE_TITLE_SMEAR "Smear"
#define SANE_TITLE_WHITE_BIND "Bind white level"
#define SANE_TITLE_BLACK_BIND "Bind black level"
#define SANE_TITLE_TEN_BIT_MODE "10 bit-mode" #define SANE_TITLE_TEN_BIT_MODE "10 bit-mode"
#define SANE_TITLE_TWELVE_BIT_MODE "12 bit-mode"
#define SANE_TITLE_WARMUP "Warmup lamp" #define SANE_TITLE_WARMUP "Warmup lamp"
#define SANE_TITLE_RGB_PREVIEW_PATCH "Preview patch" #define SANE_TITLE_RGB_PREVIEW_PATCH "Preview patch"
#define SANE_TITLE_START_SCAN_PATCH "Start-scan patch" #define SANE_TITLE_START_SCAN_PATCH "Start-scan patch"
#define SANE_TITLE_CAL_EXPOS_TIME "Cal. exposure-time"
#define SANE_TITLE_CAL_EXPOS_TIME_R "Cal. exposure-time for red"
#define SANE_TITLE_CAL_EXPOS_TIME_G "Cal. exposure-time for green"
#define SANE_TITLE_CAL_EXPOS_TIME_B "Cal. exposure-time for blue"
#define SANE_TITLE_SCAN_EXPOS_TIME "Scan exposure-time"
#define SANE_TITLE_SCAN_EXPOS_TIME_R "Scan exposure-time for red"
#define SANE_TITLE_SCAN_EXPOS_TIME_G "Scan exposure-time for green"
#define SANE_TITLE_SCAN_EXPOS_TIME_B "Scan exposure-time for blue"
#define SANE_TITLE_SELECT_EXPOSURE_TIME "Set exposure-time"
#define SANE_TITLE_CAL_LAMP_DEN "Cal. lamp density"
#define SANE_TITLE_SCAN_LAMP_DEN "Scan lamp density"
#define SANE_TITLE_SELECT_LAMP_DENSITY "Set lamp density"
/* Descriptive/help strings for above options: */ /* Descriptive/help strings for above options: */
#define SANE_DESC_NUM_OPTIONS \ #define SANE_DESC_NUM_OPTIONS \
"Read-only option that specifies how many options a specific devices " \ "Read-only option that specifies how many options a specific devices " \
"supports." "supports."
#define SANE_DESC_PREVIEW \ #define SANE_DESC_PREVIEW \
"Request a preview-quality scan." "Request a preview-quality scan."
#define SANE_DESC_GRAY_PREVIEW \ #define SANE_DESC_GRAY_PREVIEW \
skipping to change at line 168 skipping to change at line 214
#define SANE_DESC_SCAN_BR_X \ #define SANE_DESC_SCAN_BR_X \
"Bottom-right x position of scan area." "Bottom-right x position of scan area."
#define SANE_DESC_SCAN_BR_Y \ #define SANE_DESC_SCAN_BR_Y \
"Bottom-right y position of scan area." "Bottom-right y position of scan area."
#define SANE_DESC_SCAN_RESOLUTION \ #define SANE_DESC_SCAN_RESOLUTION \
"Sets the resolution of the scanned image." "Sets the resolution of the scanned image."
#define SANE_DESC_SCAN_X_RESOLUTION \
"Sets the horizontal resolution of the scanned image."
#define SANE_DESC_SCAN_Y_RESOLUTION \
"Sets the vertical resolution of the scanned image."
#define SANE_DESC_CUSTOM_GAMMA \ #define SANE_DESC_CUSTOM_GAMMA \
"Determines whether a builtin or a custom gamma-table should be used." "Determines whether a builtin or a custom gamma-table should be used."
#define SANE_DESC_GAMMA_VECTOR \ #define SANE_DESC_GAMMA_VECTOR \
"Gamma-correction table. In color mode this option equally affects the " \ "Gamma-correction table. In color mode this option equally affects the " \
"red, green, and blue channels simultaneously (i.e., it is an intensity " \ "red, green, and blue channels simultaneously (i.e., it is an intensity " \
"gamma table)." "gamma table)."
#define SANE_DESC_GAMMA_VECTOR_R \ #define SANE_DESC_GAMMA_VECTOR_R \
"Gamma-correction table for the red band." "Gamma-correction table for the red band."
skipping to change at line 204 skipping to change at line 256
#define SANE_DESC_HALFTONE \ #define SANE_DESC_HALFTONE \
"Selects whether the acquired image should be halftoned (dithered)." "Selects whether the acquired image should be halftoned (dithered)."
#define SANE_DESC_BLACK_LEVEL \ #define SANE_DESC_BLACK_LEVEL \
"Selects what radiance level should be considered \"black\"." "Selects what radiance level should be considered \"black\"."
#define SANE_DESC_WHITE_LEVEL \ #define SANE_DESC_WHITE_LEVEL \
"Selects what radiance level should be considered \"white\"." "Selects what radiance level should be considered \"white\"."
#define SANE_DESC_SHADOW \
"Selects what radiance level should be considered \"black\"."
#define SANE_DESC_SHADOW_R \
"Selects what red radiance level should be considered \"black\"."
#define SANE_DESC_SHADOW_G \
"Selects what green radiance level should be considered \"black\"."
#define SANE_DESC_SHADOW_B \
"Selects what blue radiance level should be considered \"black\"."
#define SANE_DESC_HIGHLIGHT \
"Selects what radiance level should be considered \"white\"."
#define SANE_DESC_HIGHLIGHT_R \
"Selects what red radiance level should be considered \"full red\"."
#define SANE_DESC_HIGHLIGHT_G \
"Selects what green radiance level should be considered \"full green\"."
#define SANE_DESC_HIGHLIGHT_B \
"Selects what blue radiance level should be considered \"full blue\"."
#define SANE_DESC_HUE \ #define SANE_DESC_HUE \
"Controls the \"hue\" (blue-level) of the acquired image." "Controls the \"hue\" (blue-level) of the acquired image."
#define SANE_DESC_SATURATION \ #define SANE_DESC_SATURATION \
"The saturation level controls the amount of \"blooming\" that occurs when " \ "The saturation level controls the amount of \"blooming\" that occurs when " \
"acquiring an image with a camera. Larger values cause more blooming." "acquiring an image with a camera. Larger values cause more blooming."
#define SANE_DESC_FILE "The filename of the image to be loaded." #define SANE_DESC_FILE "The filename of the image to be loaded."
#define SANE_DESC_HALFTONE_DIMENSION \ #define SANE_DESC_HALFTONE_DIMENSION \
"Sets the size of the halftoning (dithering) pattern used when scanning " \ "Sets the size of the halftoning (dithering) pattern used when scanning " \
"halftoned images." "halftoned images."
#define SANE_DESC_HALFTONE_PATTERN \ #define SANE_DESC_HALFTONE_PATTERN \
"Defines the halftoning (dithering) pattern for scanning halftoned images." "Defines the halftoning (dithering) pattern for scanning halftoned images."
#define SANE_DESC_RESOLUTION_BIND "Use same values for X and Y resolut ion" #define SANE_DESC_RESOLUTION_BIND "Use same values for X and Y resolut ion"
#define SANE_DESC_NEGATIVE "Swap black and white" #define SANE_DESC_NEGATIVE "Swap black and white"
#define SANE_DESC_QUALITY_CAL "Do a quality white-calibration" #define SANE_DESC_QUALITY_CAL "Do a quality white-calibration"
#define SANE_DESC_DOR "Use lens that doubles optical resol
ution"
#define SANE_DESC_RGB_BIND "In RGB-mode use same values for eac
h color"
#define SANE_DESC_THRESHOLD "Select minimum-brightness to get a white point" #define SANE_DESC_THRESHOLD "Select minimum-brightness to get a white point"
#define SANE_DESC_ANALOG_GAMMA "Analog gamma-correction" #define SANE_DESC_ANALOG_GAMMA "Analog gamma-correction"
#define SANE_DESC_ANALOG_GAMMA_R "Analog gamma-correction for red" #define SANE_DESC_ANALOG_GAMMA_R "Analog gamma-correction for red"
#define SANE_DESC_ANALOG_GAMMA_G "Analog gamma-correction for green" #define SANE_DESC_ANALOG_GAMMA_G "Analog gamma-correction for green"
#define SANE_DESC_ANALOG_GAMMA_B "Analog gamma-correction for blue" #define SANE_DESC_ANALOG_GAMMA_B "Analog gamma-correction for blue"
#define SANE_DESC_ANALOG_GAMMA_BIND "In RGB-mode use same values for eac
#define SANE_DESC_ANALOG_GAMMA_BIND \ h color"
"In RGB-mode use same values for each color" #define SANE_DESC_SMEAR "Don't care about image smea
ring problem"
#define SANE_DESC_SMEAR \
"Don't care about image smearing problem"
#define SANE_DESC_WHITE_BIND \
"In RGB-mode use same values for each color"
#define SANE_DESC_BLACK_BIND \
"In RGB-mode use same values for each color"
#define SANE_DESC_TEN_BIT_MODE "Output with 10 bits instead of 8 bi ts" #define SANE_DESC_TEN_BIT_MODE "Output with 10 bits instead of 8 bi ts"
#define SANE_DESC_TWELVE_BIT_MODE "Output with 12 bits instead of 8 bi ts"
#define SANE_DESC_WARMUP "Warmup lamp before scanning" #define SANE_DESC_WARMUP "Warmup lamp before scanning"
#define SANE_DESC_RGB_PREVIEW_PATCH "Set preview-bit in rgb-mode" #define SANE_DESC_RGB_PREVIEW_PATCH "Set preview-bit in rgb-mode"
#define SANE_DESC_START_SCAN_PATCH "Use special start-scan bits" #define SANE_DESC_START_SCAN_PATCH "Use special start-scan bits"
#define SANE_DESC_CAL_EXPOS_TIME "Define exposure-time for calibratio
n"
#define SANE_DESC_CAL_EXPOS_TIME_R "Define exposure-time for red calibr
ation"
#define SANE_DESC_CAL_EXPOS_TIME_G "Define exposure-time for green cali
bration"
#define SANE_DESC_CAL_EXPOS_TIME_B "Define exposure-time for blue calib
ration"
#define SANE_DESC_SCAN_EXPOS_TIME "Define exposure-time for scan"
#define SANE_DESC_SCAN_EXPOS_TIME_R "Define exposure-time for red scan"
#define SANE_DESC_SCAN_EXPOS_TIME_G "Define exposure-time for green scan
"
#define SANE_DESC_SCAN_EXPOS_TIME_B "Define exposure-time for blue scan"
#define SANE_DESC_SELECT_EXPOSURE_TIME "Enable selection of exposure-time"
#define SANE_DESC_CAL_LAMP_DEN "Define lamp density for calibration
"
#define SANE_DESC_SCAN_LAMP_DEN "Define lamp density for sca
n"
#define SANE_DESC_SELECT_LAMP_DENSITY "Enable selection of lamp density"
#endif /* saneopts_h */ #endif /* saneopts_h */
 End of changes. 19 change blocks. 
22 lines changed or deleted 107 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/