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

Fix the generated generic gamma table.

merge-requests/1/head
Pierre Willenbrock 2009-03-04 13:40:04 +00:00
rodzic 191cde3dbd
commit c96583da9e
2 zmienionych plików z 12 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
ChangeLog
Wyświetl plik

@ -1,3 +1,6 @@
2009-03-03 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
* backend/genesys_gl841.c: Fix the generated generic gamma table.
2009-02-28 Chris Bagwell <cbagwell-guest at users.alioth.debian.org> 2009-02-28 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
* tools/sane-config.in: Add space mistakenly removed during * tools/sane-config.in: Add space mistakenly removed during
last update. last update.

17
backend/genesys_gl841.c
Wyświetl plik

@ -674,7 +674,7 @@ gl841_bulk_write_data_gamma (Genesys_Device * dev, uint8_t addr,
outdata[0] = BULK_OUT; outdata[0] = BULK_OUT;
outdata[1] = BULK_RAM; outdata[1] = BULK_RAM;
outdata[2] = 0x00; outdata[2] = 0x00;/* 0x82 works, too */
outdata[3] = 0x00; outdata[3] = 0x00;
outdata[4] = (size & 0xff); outdata[4] = (size & 0xff);
outdata[5] = ((size >> 8) & 0xff); outdata[5] = ((size >> 8) & 0xff);
@ -4354,7 +4354,7 @@ gl841_send_gamma_table (Genesys_Device * dev, SANE_Bool generic)
int size; int size;
int status; int status;
uint8_t *gamma; uint8_t *gamma;
int i; int i,gmmval;
DBG (DBG_proc, "gl841_send_gamma_table\n"); DBG (DBG_proc, "gl841_send_gamma_table\n");
@ -4382,12 +4382,13 @@ gl841_send_gamma_table (Genesys_Device * dev, SANE_Bool generic)
/* fill with default values */ /* fill with default values */
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
{ {
gamma[i*2 + size * 0 + 0] = i & 0xff; gmmval = i* 256;
gamma[i*2 + size * 0 + 1] = (i >> 8) & 0xff; gamma[i*2 + size * 0 + 0] = gmmval & 0xff;
gamma[i*2 + size * 2 + 0] = i & 0xff; gamma[i*2 + size * 0 + 1] = (gmmval >> 8) & 0xff;
gamma[i*2 + size * 2 + 1] = (i >> 8) & 0xff; gamma[i*2 + size * 2 + 0] = gmmval & 0xff;
gamma[i*2 + size * 4 + 0] = i & 0xff; gamma[i*2 + size * 2 + 1] = (gmmval >> 8) & 0xff;
gamma[i*2 + size * 4 + 1] = (i >> 8) & 0xff; gamma[i*2 + size * 4 + 0] = gmmval & 0xff;
gamma[i*2 + size * 4 + 1] = (gmmval >> 8) & 0xff;
} }
} }
else else