| config.h | config.h | |||
|---|---|---|---|---|
| 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.62" | #define PACKAGE_VERSION "sane-0.63" | |||
| /* Define to the version of the distribution. */ | /* Define to the version of the distribution. */ | |||
| #define VERSION "0.62" | #define VERSION "0.63" | |||
| /* 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 215 | skipping to change at line 215 | |||
| /* 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. */ | ||||
| /* #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/scsicmd.h> header file. */ | ||||
| /* #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 <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. */ | |||
| skipping to change at line 256 | skipping to change at line 262 | |||
| #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. */ | /* Define if you need the line-distance workaround in the Mustek backend. */ | |||
| #define NEED_MUSTEK_LINE_DISTANCE_WORKAROUND 1 | #define NEED_MUSTEK_LINE_DISTANCE_WORKAROUND 1 | |||
| /* 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. 5 change blocks. | ||||
| 2 lines changed or deleted | 8 lines changed or added | |||
| saneopts.h | saneopts.h | |||
|---|---|---|---|---|
| /* sane - Scanner Access Now Easy. | /* sane - Scanner Access Now Easy. | |||
| Copyright (C) 1996 David Mosberger-Tang and Andreas Beck | Copyright (C) 1996, 1997 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 under | SANE 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 | the terms of the GNU General Public License as published by the Free | |||
| Software Foundation; either version 2 of the License, or (at your | Software Foundation; either version 2 of the License, or (at your | |||
| option) any later version. | option) any later version. | |||
| 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. See the GNU General Public License | FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |||
| skipping to change at line 61 | skipping to change at line 61 | |||
| #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_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_NEGATIVE "negative" | ||||
| #define SANE_NAME_QUALITY_CAL "quality-cal" | ||||
| #define SANE_NAME_THRESHOLD "threshold" | ||||
| #define SANE_NAME_ANALOG_GAMMA "analog-gamma" | ||||
| #define SANE_NAME_ANALOG_GAMMA_R "analog-gamma-r" | ||||
| #define SANE_NAME_ANALOG_GAMMA_G "analog-gamma-g" | ||||
| #define SANE_NAME_ANALOG_GAMMA_B "analog-gamma-b" | ||||
| #define SANE_NAME_ANALOG_GAMMA_BIND "analog-gamma-bind" | ||||
| #define SANE_NAME_SMEAR "smear" | ||||
| #define SANE_NAME_WHITE_BIND "white-bind" | ||||
| #define SANE_NAME_BLACK_BIND "black-bind" | ||||
| #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 91 | skipping to change at line 103 | |||
| #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_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_NEGATIVE "Negative" | ||||
| #define SANE_TITLE_QUALITY_CAL "Quality calibration" | ||||
| #define SANE_TITLE_THRESHOLD "Threshold" | ||||
| #define SANE_TITLE_ANALOG_GAMMA "Analog gamma correction" | ||||
| #define SANE_TITLE_ANALOG_GAMMA_R "Analog gamma red" | ||||
| #define SANE_TITLE_ANALOG_GAMMA_G "Analog gamma green" | ||||
| #define SANE_TITLE_ANALOG_GAMMA_B "Analog gamma blue" | ||||
| #define SANE_TITLE_ANALOG_GAMMA_BIND "Bind analog gamma" | ||||
| #define SANE_TITLE_SMEAR "Smear" | ||||
| #define SANE_TITLE_WHITE_BIND "Bind white level" | ||||
| #define SANE_TITLE_BLACK_BIND "Bind black level" | ||||
| /* 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 188 | skipping to change at line 212 | |||
| #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_NEGATIVE "Swap black and white" | ||||
| #define SANE_DESC_QUALITY_CAL "Do a quality white-calibration" | ||||
| #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_R "Analog gamma-correction for red" | ||||
| #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_BIND \ | ||||
| "In RGB-mode use same values for each color" | ||||
| #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" | ||||
| #endif /* saneopts_h */ | #endif /* saneopts_h */ | |||
| End of changes. 4 change blocks. | ||||
| 1 lines changed or deleted | 48 lines changed or added | |||