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

Used SANE_VALUE_SCAN_MODE_* constants.

merge-requests/1/head
Henning Geinitz 2004-05-30 13:48:40 +00:00
rodzic d5b20dfd4d
commit 73b6b966b2
2 zmienionych plików z 8 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
ChangeLog
Wyświetl plik

@ -1,3 +1,7 @@
2004-05-30 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/v4l.c: Used SANE_VALUE_SCAN_MODE_* constants.
2004-05-29 Henning Meier-Geinitz <henning@meier-geinitz.de> 2004-05-29 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/sp15c.c: Fixed the fix of the sanei_thread fix * backend/sp15c.c: Fixed the fix of the sanei_thread fix

8
backend/v4l.c
Wyświetl plik

@ -1,6 +1,6 @@
/* sane - Scanner Access Now Easy. /* sane - Scanner Access Now Easy.
Copyright (C) 1999 Juergen G. Schimmer Copyright (C) 1999 Juergen G. Schimmer
Updates and bugfixes (C) 2002, 2003 Henning Meier-Geinitz Updates and bugfixes (C) 2002 - 2004 Henning Meier-Geinitz
This file is part of the SANE package. This file is part of the SANE package.
@ -43,7 +43,7 @@
This file implements a SANE backend for v4l-Devices. This file implements a SANE backend for v4l-Devices.
*/ */
#define BUILD 3 #define BUILD 4
#include "../include/sane/config.h" #include "../include/sane/config.h"
@ -93,7 +93,7 @@ static V4L_Scanner *first_handle;
static char *buffer; static char *buffer;
static const SANE_String_Const mode_list[] = { static const SANE_String_Const mode_list[] = {
"Grey", "Color", SANE_VALUE_SCAN_MODE_GRAY, SANE_VALUE_SCAN_MODE_COLOR,
0 0
}; };
@ -807,7 +807,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
s->val[option].s = strdup (val); s->val[option].s = strdup (val);
if (!s->val[option].s) if (!s->val[option].s)
return SANE_STATUS_NO_MEM; return SANE_STATUS_NO_MEM;
if (strcmp (s->val[option].s, "Grey") == 0) if (strcmp (s->val[option].s, SANE_VALUE_SCAN_MODE_GRAY) == 0)
s->pict.palette = VIDEO_PALETTE_GREY; s->pict.palette = VIDEO_PALETTE_GREY;
else else
s->pict.palette = VIDEO_PALETTE_RGB24; s->pict.palette = VIDEO_PALETTE_RGB24;