sane.h   sane.h 
skipping to change at line 28 skipping to change at line 28
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* /*
* SANE types and defines * SANE types and defines
*/ */
#define SANE_CURRENT_MAJOR 1 #define SANE_CURRENT_MAJOR 1
#define SANE_CURRENT_MINOR 0
#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 72 skipping to change at line 73
SANE_STATUS_EOF, /* no more data available (end-of-file) */ SANE_STATUS_EOF, /* no more data available (end-of-file) */
SANE_STATUS_JAMMED, /* document feeder jammed */ SANE_STATUS_JAMMED, /* document feeder jammed */
SANE_STATUS_NO_DOCS, /* document feeder out of documents */ SANE_STATUS_NO_DOCS, /* document feeder out of documents */
SANE_STATUS_COVER_OPEN, /* scanner cover is open */ SANE_STATUS_COVER_OPEN, /* scanner cover is open */
SANE_STATUS_IO_ERROR, /* error during device I/O */ SANE_STATUS_IO_ERROR, /* error during device I/O */
SANE_STATUS_NO_MEM, /* out of memory */ SANE_STATUS_NO_MEM, /* out of memory */
SANE_STATUS_ACCESS_DENIED /* access to resource has been denied */ SANE_STATUS_ACCESS_DENIED /* access to resource has been denied */
} }
SANE_Status; SANE_Status;
/* following are for later sane version, older frontends wont support */
#if 0
#define SANE_STATUS_WARMING_UP 12 /* lamp not ready, please retry */
#define SANE_STATUS_HW_LOCKED 13 /* scanner mechanism locked for transport
*/
#endif
typedef enum typedef enum
{ {
SANE_TYPE_BOOL = 0, SANE_TYPE_BOOL = 0,
SANE_TYPE_INT, SANE_TYPE_INT,
SANE_TYPE_FIXED, SANE_TYPE_FIXED,
SANE_TYPE_STRING, SANE_TYPE_STRING,
SANE_TYPE_BUTTON, SANE_TYPE_BUTTON,
SANE_TYPE_GROUP SANE_TYPE_GROUP
} }
SANE_Value_Type; SANE_Value_Type;
skipping to change at line 111 skipping to change at line 118
} }
SANE_Device; SANE_Device;
#define SANE_CAP_SOFT_SELECT (1 << 0) #define SANE_CAP_SOFT_SELECT (1 << 0)
#define SANE_CAP_HARD_SELECT (1 << 1) #define SANE_CAP_HARD_SELECT (1 << 1)
#define SANE_CAP_SOFT_DETECT (1 << 2) #define SANE_CAP_SOFT_DETECT (1 << 2)
#define SANE_CAP_EMULATED (1 << 3) #define SANE_CAP_EMULATED (1 << 3)
#define SANE_CAP_AUTOMATIC (1 << 4) #define SANE_CAP_AUTOMATIC (1 << 4)
#define SANE_CAP_INACTIVE (1 << 5) #define SANE_CAP_INACTIVE (1 << 5)
#define SANE_CAP_ADVANCED (1 << 6) #define SANE_CAP_ADVANCED (1 << 6)
#define SANE_CAP_ALWAYS_SETTABLE (1 << 7)
#define SANE_OPTION_IS_ACTIVE(cap) (((cap) & SANE_CAP_INACTIVE) == 0) #define SANE_OPTION_IS_ACTIVE(cap) (((cap) & SANE_CAP_INACTIVE) == 0)
#define SANE_OPTION_IS_SETTABLE(cap) (((cap) & SANE_CAP_SOFT_SELECT) != 0 ) #define SANE_OPTION_IS_SETTABLE(cap) (((cap) & SANE_CAP_SOFT_SELECT) != 0 )
#define SANE_INFO_INEXACT (1 << 0) #define SANE_INFO_INEXACT (1 << 0)
#define SANE_INFO_RELOAD_OPTIONS (1 << 1) #define SANE_INFO_RELOAD_OPTIONS (1 << 1)
#define SANE_INFO_RELOAD_PARAMS (1 << 2) #define SANE_INFO_RELOAD_PARAMS (1 << 2)
typedef enum typedef enum
{ {
skipping to change at line 171 skipping to change at line 177
SANE_ACTION_SET_VALUE, SANE_ACTION_SET_VALUE,
SANE_ACTION_SET_AUTO SANE_ACTION_SET_AUTO
} }
SANE_Action; SANE_Action;
typedef enum typedef enum
{ {
SANE_FRAME_GRAY, /* band covering human visual range */ SANE_FRAME_GRAY, /* band covering human visual range */
SANE_FRAME_RGB, /* pixel-interleaved red/green/blue bands */ SANE_FRAME_RGB, /* pixel-interleaved red/green/blue bands */
SANE_FRAME_RED, /* red band only */ SANE_FRAME_RED, /* red band only */
SANE_FRAME_GREEN, /* green band only */ SANE_FRAME_GREEN, /* green band only */
SANE_FRAME_BLUE /* blue band only */ SANE_FRAME_BLUE /* blue band only */
}
SANE_Frame;
/* push remaining types down to match existing backends */ /* push remaining types down to match existing backends */
/* these frame types should not be used by default, */ /* these are to be exposed in a later version of SANE */
/* as most front-ends will not understand them */ /* most front-ends will require updates to understand them */
/* these will be enabled in SANE 1.1.0 */
#if 0 #if 0
SANE_FRAME_TEXT=10, /* for various textual/xml data */ #define SANE_FRAME_TEXT 0x0A /* backend specific textual data */
SANE_FRAME_JPEG, /* complete baseline JPEG file */ #define SANE_FRAME_JPEG 0x0B /* complete baseline JPEG file */
SANE_FRAME_G31D, /* CCITT Group 3 1-D Compressed file */ #define SANE_FRAME_G31D 0x0C /* CCITT Group 3 1-D Compressed (MH) */
SANE_FRAME_G32D, /* CCITT Group 3 2-D Compressed file */ #define SANE_FRAME_G32D 0x0D /* CCITT Group 3 2-D Compressed (MR) */
SANE_FRAME_G42D, /* CCITT Group 4 2-D Compressed file */ #define SANE_FRAME_G42D 0x0E /* CCITT Group 4 2-D Compressed (MMR) */
SANE_FRAME_IR /* bare infrared channel */ #define SANE_FRAME_IR 0x0F /* bare infrared channel */
SANE_FRAME_RGBI, /* red+green+blue+infrared */ #define SANE_FRAME_RGBI 0x10 /* red+green+blue+infrared */
SANE_FRAME_GRAYI /* gray+infrared */ #define SANE_FRAME_GRAYI 0x11 /* gray+infrared */
#define SANE_FRAME_XML 0x12 /* undefined schema */
#endif #endif
}
SANE_Frame;
typedef struct typedef struct
{ {
SANE_Frame format; SANE_Frame format;
SANE_Bool last_frame; SANE_Bool last_frame;
SANE_Int bytes_per_line; SANE_Int bytes_per_line;
SANE_Int pixels_per_line; SANE_Int pixels_per_line;
SANE_Int lines; SANE_Int lines;
SANE_Int depth; SANE_Int depth;
} }
 End of changes. 8 change blocks. 
17 lines changed or deleted 24 lines changed or added


 saneopts.h   saneopts.h 
skipping to change at line 62 skipping to change at line 62
*/ */
#ifndef saneopts_h #ifndef saneopts_h
#define saneopts_h #define saneopts_h
#ifndef SANE_I18N #ifndef SANE_I18N
#define SANE_I18N(text) text #define SANE_I18N(text) text
#endif #endif
/* This _must_ be the first option (index 0): */ /* This _must_ be the first option (index 0): */
#define SANE_NAME_NUM_OPTIONS "" /* never settable */ #define SANE_NAME_NUM_OPTIONS "" /* never settable */
/* The common option groups */
#define SANE_NAME_STANDARD "standard"
#define SANE_NAME_GEOMETRY "geometry"
#define SANE_NAME_ENHANCEMENT "enhancement"
#define SANE_NAME_ADVANCED "advanced"
#define SANE_NAME_SENSORS "sensors"
#define SANE_NAME_PREVIEW "preview" #define SANE_NAME_PREVIEW "preview"
#define SANE_NAME_GRAY_PREVIEW "preview-in-gray" #define SANE_NAME_GRAY_PREVIEW "preview-in-gray"
#define SANE_NAME_BIT_DEPTH "depth" #define SANE_NAME_BIT_DEPTH "depth"
#define SANE_NAME_SCAN_MODE "mode" #define SANE_NAME_SCAN_MODE "mode"
#define SANE_NAME_SCAN_SPEED "speed" #define SANE_NAME_SCAN_SPEED "speed"
#define SANE_NAME_SCAN_SOURCE "source" #define SANE_NAME_SCAN_SOURCE "source"
#define SANE_NAME_BACKTRACK "backtrack" #define SANE_NAME_BACKTRACK "backtrack"
/* 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_X_RESOLUTION "x-resolution"
#define SANE_NAME_SCAN_Y_RESOLUTION "y-resolution" #define SANE_NAME_SCAN_Y_RESOLUTION "y-resolution"
#define SANE_NAME_PAGE_WIDTH "page-width"
#define SANE_NAME_PAGE_HEIGHT "page-height"
#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"
skipping to change at line 134 skipping to change at line 144
#define SANE_NAME_SCAN_EXPOS_TIME "scan-exposure-time" #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_R "scan-exposure-time-r"
#define SANE_NAME_SCAN_EXPOS_TIME_G "scan-exposure-time-g" #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_SCAN_EXPOS_TIME_B "scan-exposure-time-b"
#define SANE_NAME_SELECT_EXPOSURE_TIME "select-exposure-time" #define SANE_NAME_SELECT_EXPOSURE_TIME "select-exposure-time"
#define SANE_NAME_CAL_LAMP_DEN "cal-lamp-density" #define SANE_NAME_CAL_LAMP_DEN "cal-lamp-density"
#define SANE_NAME_SCAN_LAMP_DEN "scan-lamp-density" #define SANE_NAME_SCAN_LAMP_DEN "scan-lamp-density"
#define SANE_NAME_SELECT_LAMP_DENSITY "select-lamp-density" #define SANE_NAME_SELECT_LAMP_DENSITY "select-lamp-density"
#define SANE_NAME_LAMP_OFF_AT_EXIT "lamp-off-at-exit" #define SANE_NAME_LAMP_OFF_AT_EXIT "lamp-off-at-exit"
/* well known options from 'SENSORS' group*/
#define SANE_NAME_SCAN "scan"
#define SANE_NAME_EMAIL "email"
#define SANE_NAME_FAX "fax"
#define SANE_NAME_COPY "copy"
#define SANE_NAME_PDF "pdf"
#define SANE_NAME_CANCEL "cancel"
#define SANE_NAME_PAGE_LOADED "page-loaded"
#define SANE_NAME_COVER_OPEN "cover-open"
#define SANE_TITLE_NUM_OPTIONS SANE_I18N("Number of options") #define SANE_TITLE_NUM_OPTIONS SANE_I18N("Number of options")
#define SANE_TITLE_STANDARD SANE_I18N("Standard")
#define SANE_TITLE_GEOMETRY SANE_I18N("Geometry")
#define SANE_TITLE_ENHANCEMENT SANE_I18N("Enhancement")
#define SANE_TITLE_ADVANCED SANE_I18N("Advanced")
#define SANE_TITLE_SENSORS SANE_I18N("Sensors")
#define SANE_TITLE_PREVIEW SANE_I18N("Preview") #define SANE_TITLE_PREVIEW SANE_I18N("Preview")
#define SANE_TITLE_GRAY_PREVIEW SANE_I18N("Force monochrome preview") #define SANE_TITLE_GRAY_PREVIEW SANE_I18N("Force monochrome preview")
#define SANE_TITLE_BIT_DEPTH SANE_I18N("Bit depth") #define SANE_TITLE_BIT_DEPTH SANE_I18N("Bit depth")
#define SANE_TITLE_SCAN_MODE SANE_I18N("Scan mode") #define SANE_TITLE_SCAN_MODE SANE_I18N("Scan mode")
#define SANE_TITLE_SCAN_SPEED SANE_I18N("Scan speed") #define SANE_TITLE_SCAN_SPEED SANE_I18N("Scan speed")
#define SANE_TITLE_SCAN_SOURCE SANE_I18N("Scan source") #define SANE_TITLE_SCAN_SOURCE SANE_I18N("Scan source")
#define SANE_TITLE_BACKTRACK SANE_I18N("Force backtracking") #define SANE_TITLE_BACKTRACK SANE_I18N("Force backtracking")
#define SANE_TITLE_SCAN_TL_X SANE_I18N("Top-left x") #define SANE_TITLE_SCAN_TL_X SANE_I18N("Top-left x")
#define SANE_TITLE_SCAN_TL_Y SANE_I18N("Top-left y") #define SANE_TITLE_SCAN_TL_Y SANE_I18N("Top-left y")
#define SANE_TITLE_SCAN_BR_X SANE_I18N("Bottom-right x") #define SANE_TITLE_SCAN_BR_X SANE_I18N("Bottom-right x")
#define SANE_TITLE_SCAN_BR_Y SANE_I18N("Bottom-right y") #define SANE_TITLE_SCAN_BR_Y SANE_I18N("Bottom-right y")
#define SANE_TITLE_SCAN_RESOLUTION SANE_I18N("Scan resolution") #define SANE_TITLE_SCAN_RESOLUTION SANE_I18N("Scan resolution")
#define SANE_TITLE_SCAN_X_RESOLUTION SANE_I18N("X-resolution") #define SANE_TITLE_SCAN_X_RESOLUTION SANE_I18N("X-resolution")
#define SANE_TITLE_SCAN_Y_RESOLUTION SANE_I18N("Y-resolution") #define SANE_TITLE_SCAN_Y_RESOLUTION SANE_I18N("Y-resolution")
#define SANE_TITLE_PAGE_WIDTH SANE_I18N("Page width")
#define SANE_TITLE_PAGE_HEIGHT SANE_I18N("Page height")
#define SANE_TITLE_CUSTOM_GAMMA SANE_I18N("Use custom gamma table") #define SANE_TITLE_CUSTOM_GAMMA SANE_I18N("Use custom gamma table")
#define SANE_TITLE_GAMMA_VECTOR SANE_I18N("Image intensity") #define SANE_TITLE_GAMMA_VECTOR SANE_I18N("Image intensity")
#define SANE_TITLE_GAMMA_VECTOR_R SANE_I18N("Red intensity") #define SANE_TITLE_GAMMA_VECTOR_R SANE_I18N("Red intensity")
#define SANE_TITLE_GAMMA_VECTOR_G SANE_I18N("Green intensity") #define SANE_TITLE_GAMMA_VECTOR_G SANE_I18N("Green intensity")
#define SANE_TITLE_GAMMA_VECTOR_B SANE_I18N("Blue intensity") #define SANE_TITLE_GAMMA_VECTOR_B SANE_I18N("Blue intensity")
#define SANE_TITLE_BRIGHTNESS SANE_I18N("Brightness") #define SANE_TITLE_BRIGHTNESS SANE_I18N("Brightness")
#define SANE_TITLE_CONTRAST SANE_I18N("Contrast") #define SANE_TITLE_CONTRAST SANE_I18N("Contrast")
#define SANE_TITLE_GRAIN_SIZE SANE_I18N("Grain size") #define SANE_TITLE_GRAIN_SIZE SANE_I18N("Grain size")
#define SANE_TITLE_HALFTONE SANE_I18N("Halftoning") #define SANE_TITLE_HALFTONE SANE_I18N("Halftoning")
#define SANE_TITLE_BLACK_LEVEL SANE_I18N("Black level") #define SANE_TITLE_BLACK_LEVEL SANE_I18N("Black level")
skipping to change at line 204 skipping to change at line 233
#define SANE_TITLE_SCAN_EXPOS_TIME_R SANE_I18N("Scan exposure-time for re d") #define SANE_TITLE_SCAN_EXPOS_TIME_R SANE_I18N("Scan exposure-time for re d")
#define SANE_TITLE_SCAN_EXPOS_TIME_G SANE_I18N("Scan exposure-time for " \ #define SANE_TITLE_SCAN_EXPOS_TIME_G SANE_I18N("Scan exposure-time for " \
"green") "green")
#define SANE_TITLE_SCAN_EXPOS_TIME_B SANE_I18N("Scan exposure-time for bl ue") #define SANE_TITLE_SCAN_EXPOS_TIME_B SANE_I18N("Scan exposure-time for bl ue")
#define SANE_TITLE_SELECT_EXPOSURE_TIME SANE_I18N("Set exposure-time ") #define SANE_TITLE_SELECT_EXPOSURE_TIME SANE_I18N("Set exposure-time ")
#define SANE_TITLE_CAL_LAMP_DEN SANE_I18N("Cal. lamp density ") #define SANE_TITLE_CAL_LAMP_DEN SANE_I18N("Cal. lamp density ")
#define SANE_TITLE_SCAN_LAMP_DEN SANE_I18N("Scan lamp density") #define SANE_TITLE_SCAN_LAMP_DEN SANE_I18N("Scan lamp density")
#define SANE_TITLE_SELECT_LAMP_DENSITY SANE_I18N("Set lamp density") #define SANE_TITLE_SELECT_LAMP_DENSITY SANE_I18N("Set lamp density")
#define SANE_TITLE_LAMP_OFF_AT_EXIT SANE_I18N("Lamp off at exit") #define SANE_TITLE_LAMP_OFF_AT_EXIT SANE_I18N("Lamp off at exit")
/* well known options from 'SENSORS' group*/
#define SANE_TITLE_SCAN "Scan button"
#define SANE_TITLE_EMAIL "Email button"
#define SANE_TITLE_FAX "Fax button"
#define SANE_TITLE_COPY "Copy button"
#define SANE_TITLE_PDF "PDF button"
#define SANE_TITLE_CANCEL "Cancel button"
#define SANE_TITLE_PAGE_LOADED "Page loaded"
#define SANE_TITLE_COVER_OPEN "Cover open"
/* Descriptive/help strings for above options: */ /* Descriptive/help strings for above options: */
#define SANE_DESC_NUM_OPTIONS \ #define SANE_DESC_NUM_OPTIONS \
SANE_I18N("Read-only option that specifies how many options a specific " \ SANE_I18N("Read-only option that specifies how many options a specific " \
"devices supports.") "devices supports.")
#define SANE_DESC_STANDARD SANE_I18N("Source, mode and resolution option
s")
#define SANE_DESC_GEOMETRY SANE_I18N("Scan area and media size options")
#define SANE_DESC_ENHANCEMENT SANE_I18N("Image modification options")
#define SANE_DESC_ADVANCED SANE_I18N("Hardware specific options")
#define SANE_DESC_SENSORS SANE_I18N("Scanner sensors and buttons")
#define SANE_DESC_PREVIEW \ #define SANE_DESC_PREVIEW \
SANE_I18N("Request a preview-quality scan.") SANE_I18N("Request a preview-quality scan.")
#define SANE_DESC_GRAY_PREVIEW \ #define SANE_DESC_GRAY_PREVIEW \
SANE_I18N("Request that all previews are done in monochrome mode. On a " \ SANE_I18N("Request that all previews are done in monochrome mode. On a " \
"three-pass scanner this cuts down the number of passes to one and on a " \ "three-pass scanner this cuts down the number of passes to one and on a " \
"one-pass scanner, it reduces the memory requirements and scan-time of the " \ "one-pass scanner, it reduces the memory requirements and scan-time of the " \
"preview.") "preview.")
#define SANE_DESC_BIT_DEPTH \ #define SANE_DESC_BIT_DEPTH \
skipping to change at line 255 skipping to change at line 300
#define SANE_DESC_SCAN_RESOLUTION \ #define SANE_DESC_SCAN_RESOLUTION \
SANE_I18N("Sets the resolution of the scanned image.") SANE_I18N("Sets the resolution of the scanned image.")
#define SANE_DESC_SCAN_X_RESOLUTION \ #define SANE_DESC_SCAN_X_RESOLUTION \
SANE_I18N("Sets the horizontal resolution of the scanned image.") SANE_I18N("Sets the horizontal resolution of the scanned image.")
#define SANE_DESC_SCAN_Y_RESOLUTION \ #define SANE_DESC_SCAN_Y_RESOLUTION \
SANE_I18N("Sets the vertical resolution of the scanned image.") SANE_I18N("Sets the vertical resolution of the scanned image.")
#define SANE_DESC_PAGE_WIDTH \
SANE_I18N("Specifies the width of the media. Required for automatic " \
"centering of sheet-fed scans.")
#define SANE_DESC_PAGE_HEIGHT \
SANE_I18N("Specifies the height of the media.")
#define SANE_DESC_CUSTOM_GAMMA \ #define SANE_DESC_CUSTOM_GAMMA \
SANE_I18N("Determines whether a builtin or a custom gamma-table should be " \ SANE_I18N("Determines whether a builtin or a custom gamma-table should be " \
"used.") "used.")
#define SANE_DESC_GAMMA_VECTOR \ #define SANE_DESC_GAMMA_VECTOR \
SANE_I18N("Gamma-correction table. In color mode this option equally " \ SANE_I18N("Gamma-correction table. In color mode this option equally " \
"affects the red, green, and blue channels simultaneously (i.e., it is an " \ "affects the red, green, and blue channels simultaneously (i.e., it is an " \
"intensity gamma table).") "intensity gamma table).")
#define SANE_DESC_GAMMA_VECTOR_R \ #define SANE_DESC_GAMMA_VECTOR_R \
skipping to change at line 391 skipping to change at line 443
SANE_I18N("Enable selection of exposure-time") SANE_I18N("Enable selection of exposure-time")
#define SANE_DESC_CAL_LAMP_DEN \ #define SANE_DESC_CAL_LAMP_DEN \
SANE_I18N("Define lamp density for calibration") SANE_I18N("Define lamp density for calibration")
#define SANE_DESC_SCAN_LAMP_DEN \ #define SANE_DESC_SCAN_LAMP_DEN \
SANE_I18N("Define lamp density for scan") SANE_I18N("Define lamp density for scan")
#define SANE_DESC_SELECT_LAMP_DENSITY \ #define SANE_DESC_SELECT_LAMP_DENSITY \
SANE_I18N("Enable selection of lamp density") SANE_I18N("Enable selection of lamp density")
#define SANE_DESC_LAMP_OFF_AT_EXIT \ #define SANE_DESC_LAMP_OFF_AT_EXIT \
SANE_I18N("Turn off lamp when program exits") SANE_I18N("Turn off lamp when program exits")
/* Typical values for stringlists (to keep the backends consistent) */ /* well known options from 'SENSORS' group*/
#define SANE_DESC_SCAN SANE_I18N("Scan button")
#define SANE_DESC_EMAIL SANE_I18N("Email button")
#define SANE_DESC_FAX SANE_I18N("Fax button")
#define SANE_DESC_COPY SANE_I18N("Copy button")
#define SANE_DESC_PDF SANE_I18N("PDF button")
#define SANE_DESC_CANCEL SANE_I18N("Cancel button")
#define SANE_DESC_PAGE_LOADED SANE_I18N("Page loaded")
#define SANE_DESC_COVER_OPEN SANE_I18N("Cover open")
/* Typical values for stringlists (to keep the backends consistent) */
#define SANE_VALUE_SCAN_MODE_COLOR SANE_I18N("Color") #define SANE_VALUE_SCAN_MODE_COLOR SANE_I18N("Color")
#define SANE_VALUE_SCAN_MODE_GRAY SANE_I18N("Gray") #define SANE_VALUE_SCAN_MODE_GRAY SANE_I18N("Gray")
#define SANE_VALUE_SCAN_MODE_LINEART SANE_I18N("Lineart") #define SANE_VALUE_SCAN_MODE_LINEART SANE_I18N("Lineart")
#endif /* saneopts_h */ #endif /* saneopts_h */
 End of changes. 11 change blocks. 
2 lines changed or deleted 64 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/