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

hp5400: use standard defines for "color" and "grey" texts

fix-build-obselete-jpeg
Ralph Little 2020-03-07 19:55:52 -08:00
rodzic 19d033837e
commit 5441ea1c51
2 zmienionych plików z 4 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
backend/hp5400.h
Wyświetl plik

@ -63,13 +63,6 @@
#define HW_DPI 300 /* horizontal resolution of hardware */ #define HW_DPI 300 /* horizontal resolution of hardware */
#define HW_LPI 300 /* vertical resolution of hardware */ #define HW_LPI 300 /* vertical resolution of hardware */
/*
* Names for the Colour/BW switch modes.
*
*/
#define COLOURBW_MODE_COLOUR SANE_I18N("Color")
#define COLOURBW_MODE_GREY SANE_I18N("Gray")
enum ScanType enum ScanType
{ {
SCAN_TYPE_CALIBRATION, SCAN_TYPE_CALIBRATION,

8
backend/hp5400_sane.c
Wyświetl plik

@ -235,8 +235,8 @@ static const SANE_Device **_pSaneDevList = 0;
static const SANE_Range rangeGammaTable = {0, 65535, 1}; static const SANE_Range rangeGammaTable = {0, 65535, 1};
static const SANE_Range rangeCopyCountTable = {0, 99, 1}; static const SANE_Range rangeCopyCountTable = {0, 99, 1};
static SANE_String_Const modeSwitchList[] = { static SANE_String_Const modeSwitchList[] = {
COLOURBW_MODE_COLOUR, SANE_VALUE_SCAN_MODE_COLOR,
COLOURBW_MODE_GREY, SANE_VALUE_SCAN_MODE_GRAY,
NULL NULL
}; };
#ifdef SUPPORT_2400_DPI #ifdef SUPPORT_2400_DPI
@ -1059,11 +1059,11 @@ sane_control_option (SANE_Handle h, SANE_Int n, SANE_Action Action,
SANE_String bwColour = (SANE_String)pVal; SANE_String bwColour = (SANE_String)pVal;
SANE_Word bwColourValue; SANE_Word bwColourValue;
if (strcmp(bwColour, COLOURBW_MODE_COLOUR) == 0) if (strcmp(bwColour, SANE_VALUE_SCAN_MODE_COLOR) == 0)
{ {
bwColourValue = 1; bwColourValue = 1;
} }
else if (strcmp(bwColour, COLOURBW_MODE_GREY) == 0) else if (strcmp(bwColour, SANE_VALUE_SCAN_MODE_GRAY) == 0)
{ {
bwColourValue = 2; bwColourValue = 2;
} }