From db931572efb5c6f3081225f91d31cb2baae471c9 Mon Sep 17 00:00:00 2001 From: Matthew Duggan Date: Wed, 5 May 2004 00:26:42 +0000 Subject: [PATCH] 2004-05-05 Matthew Duggan * include/sane/saneopts.h: Added SANE_VALUE_SCAN_MODE_* strings. * backend/canon_pp.c: Used them. --- ChangeLog | 5 +++++ backend/canon_pp.c | 6 +++++- include/sane/saneopts.h | 6 ++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 11e534929..75f83eeda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-05-05 Matthew Duggan + + * include/sane/saneopts.h: Added SANE_VALUE_SCAN_MODE_* strings. + * backend/canon_pp.c: Used them. + 2004-05-01 Jochen Eisinger * tools/hotplug/libsane.usbmap: removed empty lines, latest diff --git a/backend/canon_pp.c b/backend/canon_pp.c index 8bf31daf4..da3be2c68 100644 --- a/backend/canon_pp.c +++ b/backend/canon_pp.c @@ -114,7 +114,11 @@ static SANE_Bool force_nibble = SANE_FALSE; /* Constants */ /* Colour Modes */ -static const SANE_String_Const cmodes[] = { "Greyscale", "Colour", NULL }; +static const SANE_String_Const cmodes[] = { + SANE_VALUE_SCAN_MODE_GRAY, + SANE_VALUE_SCAN_MODE_COLOR, + NULL }; + /* bit depths */ static const SANE_String_Const depths[] = { "8", "12", NULL }; /* resolutions */ diff --git a/include/sane/saneopts.h b/include/sane/saneopts.h index d88422d42..9ad8f76f6 100644 --- a/include/sane/saneopts.h +++ b/include/sane/saneopts.h @@ -384,4 +384,10 @@ SANE_I18N("Define lamp density for scan") #define SANE_DESC_SELECT_LAMP_DENSITY \ SANE_I18N("Enable selection of lamp density") +/* Typical values for stringlists (to keep the backends consistent) */ + +#define SANE_VALUE_SCAN_MODE_COLOR SANE_I18N("Color") +#define SANE_VALUE_SCAN_MODE_GRAY SANE_I18N("Gray") +#define SANE_VALUE_SCAN_MODE_LINEART SANE_I18N("Lineart") + #endif /* saneopts_h */