| config.h | config.h | |||
|---|---|---|---|---|
| skipping to change at line 29 | skipping to change at line 29 | |||
| /* Define if you have alloca, as a function or macro. */ | /* Define if you have alloca, as a function or macro. */ | |||
| #define HAVE_ALLOCA 1 | #define HAVE_ALLOCA 1 | |||
| /* Define if you have <alloca.h> and it should be used (not on Ultrix). */ | /* Define if you have <alloca.h> and it should be used (not on Ultrix). */ | |||
| #define HAVE_ALLOCA_H 1 | #define HAVE_ALLOCA_H 1 | |||
| /* Define if you have a working `mmap' system call. */ | /* Define if you have a working `mmap' system call. */ | |||
| #define HAVE_MMAP 1 | #define HAVE_MMAP 1 | |||
| /* Define as __inline if that's what the C compiler calls it. */ | /* Define as __inline if that's what the C compiler calls it. */ | |||
| /* #undef inline */ | #define inline __inline__ | |||
| /* Define if on MINIX. */ | /* Define if on MINIX. */ | |||
| /* #undef _MINIX */ | /* #undef _MINIX */ | |||
| /* Define to `long' if <sys/types.h> doesn't define. */ | /* Define to `long' if <sys/types.h> doesn't define. */ | |||
| /* #undef off_t */ | /* #undef off_t */ | |||
| /* 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 */ | |||
| skipping to change at line 90 | skipping to change at line 90 | |||
| /* 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.63" | #define PACKAGE_VERSION "sane-0.67" | |||
| /* Define to the version of the distribution. */ | /* Define to the version of the distribution. */ | |||
| #define VERSION "0.63" | #define VERSION "0.67" | |||
| /* 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 152 | skipping to change at line 152 | |||
| /* Define if you have the strcasecmp function. */ | /* Define if you have the strcasecmp function. */ | |||
| /* #undef HAVE_STRCASECMP */ | /* #undef HAVE_STRCASECMP */ | |||
| /* 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 HAVE_STRNCASECMP 1 | ||||
| /* Define if you have the strndup function. */ | /* Define if you have the strndup function. */ | |||
| #define HAVE_STRNDUP 1 | #define HAVE_STRNDUP 1 | |||
| /* Define if you have the strftime function. */ | /* Define if you have the strftime function. */ | |||
| #define HAVE_STRFTIME 1 | #define HAVE_STRFTIME 1 | |||
| /* Define if you have the strstr function. */ | /* Define if you have the strstr function. */ | |||
| #define HAVE_STRSTR 1 | #define HAVE_STRSTR 1 | |||
| /* Define if you have the strsep function. */ | /* Define if you have the strsep function. */ | |||
| skipping to change at line 206 | skipping to change at line 209 | |||
| /* 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/io.h> header file. */ | ||||
| #define HAVE_SYS_IO_H 1 | ||||
| /* Define if you have the <asm/io.h> header file. */ | ||||
| /* #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. */ | |||
| #define HAVE_SCSI_SG_H 1 | #define HAVE_SCSI_SG_H 1 | |||
| /* 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. */ | |||
| skipping to change at line 236 | skipping to change at line 245 | |||
| /* 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 <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 <os2.h> header file. */ | ||||
| /* #undef HAVE_OS2_H */ | ||||
| /* 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 260 | skipping to change at line 272 | |||
| /* 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 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 need the line-distance workaround in the Mustek backend. | #ifndef HAVE_STRNCASECMP | |||
| */ | /* OS/2 needs this */ | |||
| #define NEED_MUSTEK_LINE_DISTANCE_WORKAROUND 1 | # define strncasecmp(a, b, c) strnicmp(a, b, c) | |||
| #endif | ||||
| /* Define if your UMAX-scanner needs preview-bit set in RGB-mode (UMAX-S6E) | ||||
| */ | ||||
| /* #undef UMAX_RGB_PREVIEW */ | ||||
| /* Define if your UMAX-scanner needs in start_scan wid=1,2,3 */ | ||||
| /* #undef UMAX_START_SCAN_PATCH */ | ||||
| End of changes. 7 change blocks. | ||||
| 3 lines changed or deleted | 15 lines changed or added | |||
| saneopts.h | saneopts.h | |||
|---|---|---|---|---|
| skipping to change at line 73 | skipping to change at line 73 | |||
| #define SANE_NAME_QUALITY_CAL "quality-cal" | #define SANE_NAME_QUALITY_CAL "quality-cal" | |||
| #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_WHITE_BIND "white-bind" | |||
| #define SANE_NAME_BLACK_BIND "black-bind" | #define SANE_NAME_BLACK_BIND "black-bind" | |||
| #define SANE_NAME_TEN_BIT_MODE "ten-bit-mode" | ||||
| #define SANE_NAME_WARMUP "warmup" | ||||
| #define SANE_NAME_RGB_PREVIEW_PATCH "preview-patch" | ||||
| #define SANE_NAME_START_SCAN_PATCH "start-scan-patch" | ||||
| #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" | |||
| skipping to change at line 115 | skipping to change at line 119 | |||
| #define SANE_TITLE_QUALITY_CAL "Quality calibration" | #define SANE_TITLE_QUALITY_CAL "Quality calibration" | |||
| #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_WHITE_BIND "Bind white level" | |||
| #define SANE_TITLE_BLACK_BIND "Bind black level" | #define SANE_TITLE_BLACK_BIND "Bind black level" | |||
| #define SANE_TITLE_TEN_BIT_MODE "10 bit-mode" | ||||
| #define SANE_TITLE_WARMUP "Warmup lamp" | ||||
| #define SANE_TITLE_RGB_PREVIEW_PATCH "Preview patch" | ||||
| #define SANE_TITLE_START_SCAN_PATCH "Start-scan patch" | ||||
| /* 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 233 | skipping to change at line 241 | |||
| #define SANE_DESC_SMEAR \ | #define SANE_DESC_SMEAR \ | |||
| "Don't care about image smearing problem" | "Don't care about image smearing problem" | |||
| #define SANE_DESC_WHITE_BIND \ | #define SANE_DESC_WHITE_BIND \ | |||
| "In RGB-mode use same values for each color" | "In RGB-mode use same values for each color" | |||
| #define SANE_DESC_BLACK_BIND \ | #define SANE_DESC_BLACK_BIND \ | |||
| "In RGB-mode use same values for each color" | "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_WARMUP "Warmup lamp before scanning" | ||||
| #define SANE_DESC_RGB_PREVIEW_PATCH "Set preview-bit in rgb-mode" | ||||
| #define SANE_DESC_START_SCAN_PATCH "Use special start-scan bits" | ||||
| #endif /* saneopts_h */ | #endif /* saneopts_h */ | |||
| End of changes. 3 change blocks. | ||||
| 0 lines changed or deleted | 14 lines changed or added | |||