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

Merge branch 'stv-werror-fix-constant-redefinition' into 'master' 

stv: Fix macro constant redefinition

See merge request sane-project/backends!171
merge-requests/171/merge
Povilas Kanapickas 2019-09-27 20:37:08 +00:00
rodzic 015252e4a8 e0974ab74a
commit 60ce6b5c01
1 zmienionych plików z 6 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
backend/stv680.c
Wyświetl plik

@ -1189,8 +1189,8 @@ stv680_fill_image (Stv680_Vidcam * dev)
} }
#define MSG_MAXLEN 45 #define MSG_MAXLEN 45
#define CHAR_HEIGHT 11 #define TEXT_CHAR_HEIGHT 11
#define CHAR_WIDTH 6 #define TEXT_CHAR_WIDTH 6
#define CHAR_START 4 #define CHAR_START 4
static SANE_Status static SANE_Status
@ -1216,14 +1216,14 @@ stv680_add_text (SANE_Byte * image, int width, int height, char *txt)
len = strftime (line, MSG_MAXLEN, fmttxt, tm); len = strftime (line, MSG_MAXLEN, fmttxt, tm);
for (y = 0; y < CHAR_HEIGHT; y++) for (y = 0; y < TEXT_CHAR_HEIGHT; y++)
{ {
ptr = image + 3 * width * (height - CHAR_HEIGHT - 2 + y) + 12; ptr = image + 3 * width * (height - TEXT_CHAR_HEIGHT - 2 + y) + 12;
for (x = 0; x < len; x++) for (x = 0; x < len; x++)
{ {
f = fontdata[line[x] * CHAR_HEIGHT + y]; f = fontdata[line[x] * TEXT_CHAR_HEIGHT + y];
for (i = CHAR_WIDTH - 1; i >= 0; i--) for (i = TEXT_CHAR_WIDTH - 1; i >= 0; i--)
{ {
if (f & (CHAR_START << i)) if (f & (CHAR_START << i))
{ {