mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

genesys: Use STR_ prefix to macros yielding to strings

merge-requests/82/head
Povilas Kanapickas 2019-06-08 14:03:52 +03:00
rodzic 06157f753c
commit 374a3043fa
2 zmienionych plików z 7 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
backend/genesys.cc
Wyświetl plik

@ -98,8 +98,8 @@ static SANE_String_Const cis_color_filter_list[] = {
}; };
static SANE_String_Const source_list[] = { static SANE_String_Const source_list[] = {
SANE_I18N (FLATBED), SANE_I18N (STR_FLATBED),
SANE_I18N (TRANSPARENCY_ADAPTER), SANE_I18N (STR_TRANSPARENCY_ADAPTER),
0 0
}; };
@ -4947,7 +4947,7 @@ calc_parameters (Genesys_Scanner * s)
s->dev->settings.scan_mode = SCAN_MODE_LINEART; s->dev->settings.scan_mode = SCAN_MODE_LINEART;
} }
if (s->source == FLATBED) { if (s->source == STR_FLATBED) {
s->dev->settings.scan_method = SCAN_METHOD_FLATBED; s->dev->settings.scan_method = SCAN_METHOD_FLATBED;
} else { /* transparency */ } else { /* transparency */
s->dev->settings.scan_method = SCAN_METHOD_TRANSPARENCY; s->dev->settings.scan_method = SCAN_METHOD_TRANSPARENCY;
@ -5251,7 +5251,7 @@ init_options (Genesys_Scanner * s)
s->opt[OPT_SOURCE].constraint_type = SANE_CONSTRAINT_STRING_LIST; s->opt[OPT_SOURCE].constraint_type = SANE_CONSTRAINT_STRING_LIST;
s->opt[OPT_SOURCE].size = max_string_size (source_list); s->opt[OPT_SOURCE].size = max_string_size (source_list);
s->opt[OPT_SOURCE].constraint.string_list = source_list; s->opt[OPT_SOURCE].constraint.string_list = source_list;
s->source = FLATBED; s->source = STR_FLATBED;
if (model->flags & GENESYS_FLAG_HAS_UTA) if (model->flags & GENESYS_FLAG_HAS_UTA)
{ {
ENABLE (OPT_SOURCE); ENABLE (OPT_SOURCE);
@ -6956,7 +6956,7 @@ set_option_value (Genesys_Scanner * s, int option, void *val,
s->source = reinterpret_cast<const char*>(val); s->source = reinterpret_cast<const char*>(val);
// change geometry constraint to the new source value // change geometry constraint to the new source value
if (s->source == FLATBED) if (s->source == STR_FLATBED)
{ {
x_range=create_range(s->dev->model->x_size); x_range=create_range(s->dev->model->x_size);
y_range=create_range(s->dev->model->y_size); y_range=create_range(s->dev->model->y_size);

4
backend/genesys.h
Wyświetl plik

@ -74,8 +74,8 @@
/* Maximum time for lamp warm-up */ /* Maximum time for lamp warm-up */
#define WARMUP_TIME 65 #define WARMUP_TIME 65
#define FLATBED "Flatbed" #define STR_FLATBED "Flatbed"
#define TRANSPARENCY_ADAPTER "Transparency Adapter" #define STR_TRANSPARENCY_ADAPTER "Transparency Adapter"
#ifndef SANE_I18N #ifndef SANE_I18N
#define SANE_I18N(text) text #define SANE_I18N(text) text